diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index f4805c9..aad409c 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Moenie klank speel as tablet op dok geplaas of afgehaal word nie"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Moenie klank speel wanneer foon in dok gesit of uitgehaal word nie"</string>
     <string name="account_settings" msgid="6403589284618783461">"Rekeninge"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoonlik"</string>
-    <string name="category_work" msgid="8699184680584175622">"Werk"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Werkprofielrekeninge – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Persoonlikeprofielrekeninge"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Werkrekening – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Gedeaktiveer"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altyd aan"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Outomaties"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Skakel om na lêerenkripsie"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Skakel om …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Lêerenkripsie is reeds uitgevoer"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Skakel dataverdeling om in lêer-gebaseerde enkripsie.\n !!Waarskuwing!! Dit sal al jou data uitvee.\n Hierdie kenmerk is alfa en sal dalk nie reg werk nie.\n Druk \'Maak skoon en skakel om …\' om voort te gaan."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Maak skoon en skakel om …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skerm skakel af"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vra PIN voordat jy ontspeld"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vra wagwoord voordat jy ontspeld"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sluit toestel terwyl jy ontspeld"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hierdie werkprofiel word bestuur deur:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Bestuur deur <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimenteel)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Gevorderd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stel programme op"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende program"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Kies profiel"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Programtoestemmings"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme mag bykomende toegang hê"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> programme toegelaat"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Fotokleurmodus"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gebruik sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Vertoonskaal"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"vertoon digtheid zoem skaal skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Klein"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normaal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Groot"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Groter"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Grootste"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Gepasmaak (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 2075d9b..2197394 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ከትከል ጡባዊ ስትከት ወይም ስታስወግድ ድምፅ አታጫውት"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
     <string name="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
-    <string name="category_personal" msgid="1299663247844969448">"የግል"</string>
-    <string name="category_work" msgid="8699184680584175622">"ስራ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"የስራ መገለጫ መለያዎች - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"የግል መገለጫ መለያዎች"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"የስራ መለያ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ተሰናክሏል"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ሁልጊዜ ይበራል"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ራስ-ሰር"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ወደ ፋይል ምሥጠራ ቀይር"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"ለውጥ ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ፋይል አስቀድሞ ተመስጥሯል"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"የውሂብ ክፍፍልን ወደ በፋይል ላይ የተመሠረተ ምሥጠራ ይቀይሩ።\n !!ማስጠንቀቂያ!! ይሄ ሁሉንም ውሂብዎን ይደመስሳል።\n ይህ ባህሪ አልፋ ላይ ነው፣ እና በትክክል ላይሠራ ይችላል።\n ለመቀጠል «ይጥረጉ እና ይለውጡ...» የሚለውን ይጫኑ።"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ይጥረጉ እና ይለውጡ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"አንቀላፋ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ማያ ገጽ የሚጠፋው"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ከመንቀል በፊት ፒን ጠይቅ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ከመንቀል በፊት የይለፍ ቃል ጠይቅ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ሲነቀል መሣሪያ ቆልፍ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"የስራ መገለጫ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ይህ የስራ መገለጫ የሚቀናበረው በ፦"</string>
     <string name="managing_admin" msgid="8843802210377459055">"በ<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> የሚቀናበር"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(የሙከራ)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"የላቀ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"መተግበሪያዎች ያዋቅሩ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ያልታወቀ መተግበሪያ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"መገለጫ ይምረጡ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"የመተግበሪያ ፈቃዶች"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ተጨማሪ መዳረሻ ይፈቅዳሉ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ከ<xliff:g id="COUNT_1">%d</xliff:g> መተግበሪያዎች ይፈቀዳል"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"የስዕል ቀለም ሁነታ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ይጠቀሙ"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ልኬትን አሳይ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"የእምቅነት አጉላ/አሳንስ ልኬት ማመጣጠንን አሳይ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ትንሽ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"መደበኛ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ትልቅ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ተለቅ ያለ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"በጣም ተለቅ ያለ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ብጁ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f77497e..1406c5f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -843,8 +843,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"عدم تشغيل صوت أثناء إدراج الجهاز اللوحي أو إزالته من المرسى"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"عدم تشغيل صوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
     <string name="account_settings" msgid="6403589284618783461">"الحسابات"</string>
-    <string name="category_personal" msgid="1299663247844969448">"شخصي"</string>
-    <string name="category_work" msgid="8699184680584175622">"العمل"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"حسابات الملفات الشخصية للعمل - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"حسابات الملفات الشخصية"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"حساب العمل - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -867,6 +865,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"معطَّل"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"التشغيل دائمًا"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"تلقائيًا"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"التحويل إلى تشفير ملفات"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"تحويل …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"تم استخدام تشفير ملفات من قبل"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"تحويل قسم البيانات إلى تشفير على الملف.\n !!تحذير!! سيؤدي هذا إلى محو جميع بياناتك.\n لا تزال هذه الميزة في مرحلة ألفا، وقد لا تعمل على نحو سليم.\n للمتابعة، اضغط على \"مسح وتحويل...\"."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"مسح وتحويل..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"السكون"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"إيقاف الشاشة"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
@@ -2708,7 +2711,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"مطالبة برقم تعريف قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل الجهاز عند إزالة التثبيت"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"الملف الشخصي للعمل"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"تتم إدارة الملف الشخصي للعمل هذا بواسطة:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"يديرها <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
@@ -2805,7 +2807,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"متقدمة"</string>
     <string name="configure_apps" msgid="6685680790825882528">"تهيئة التطبيقات"</string>
     <string name="unknown_app" msgid="5275921288718717656">"تطبيق غير معروف"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"اختيار ملف شخصي"</string>
     <string name="app_permissions" msgid="4148222031991883874">"أذونات التطبيق"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"تم السماح بدخول إضافي لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"تم السماح لعدد <xliff:g id="COUNT_0">%d</xliff:g> من إجمالي <xliff:g id="COUNT_1">%d</xliff:g> من التطبيقات"</string>
@@ -2974,20 +2975,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"نمط لون الصورة"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استخدام sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"مقياس العرض"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ضبط مقياس تكبير كثافة العرض"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"صغير"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"عادي"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"كبير"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"أكبر"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"الأكبر"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"مخصص (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index a326a50..bfc64bc 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Planşeti doka daxil edən və dokdan çıxaran zaman səs siqnalı verilməsin."</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefonu doka daxil edən və dokdan çıxaran zaman səs siqnalı verilməsin."</string>
     <string name="account_settings" msgid="6403589284618783461">"Hesablar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Şəxsi"</string>
-    <string name="category_work" msgid="8699184680584175622">"İş"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"İş profili hesabları - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Şəxsi profil hesabları"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"İş hesabı - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Qeyri-aktiv"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Həmişə aktiv"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Avtomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Fayl şifrələnməsinə çevirin"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Çevirin..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl artıq şifrələnib"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Data bölgüsünü fayl əsaslı şifrələməyə çevirin.\n !!Xəbərdarlıq!! Bu, bütün datanızı siləcək.\n Bu xüsusiyyət alfadır və düzgün işləməyə bilər.\n Davam etmək üçün \'Silin və çevirin...\' düyməsinə basın."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Silin və çevirin..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Yuxu"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran sönür"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> fəaliyyətsizlikdən sonra"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ayırmadan öncə PIN istənilsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ayırmadan öncə parol istənilsin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ekranı açarkən cihazı kilidləyin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profilini idarə edir:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tərəfindən idarə olunur"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Qabaqcıl"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Tətbiqi konfiqurasiya edin"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Naməlum tətbiq"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Tətbiq icazələri"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%d</xliff:g> tətbiqə əlavə girişə icazə var"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> tətbiqdən <xliff:g id="COUNT_0">%d</xliff:g> tətbiq icazəlidir"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 9059255..1d1199f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Без пускане на звук при поставяне или премахване на таблета от докинг станция"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Без пускане на звуци при поставяне или премахване на телефона от докинг станция"</string>
     <string name="account_settings" msgid="6403589284618783461">"Профили"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лични"</string>
-    <string name="category_work" msgid="8699184680584175622">"Служебни"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Профили със служебен потребителски профил – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Профили с личен потребителски профил"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Служебен профил – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Деактивирано"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Винаги включено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Преобразуване към шифроване на ниво файл"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Преобразуване..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Данните вече са шифровани на ниво файл"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Делът с данни ще се преобразува към шифроване на ниво файл.\n Предупреждение: Всичките ви данни ще се изтрият!\n Тази функция е в алфа версия и може да не работи правилно.\n Натиснете „Изтриване и преобразуване...“, за да продължите."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Изтриване и преобразуване..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранът се изключва"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ПИН код преди освобождаване"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитване за парола преди освобождаване"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заключване на устройството при освобождаване"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Служебен потр. профил"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Този служебен потребителски профил се управлява от:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управлява се от <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуриране на приложенията"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Разрешения"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат допълнителен достъп"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> от <xliff:g id="COUNT_1">%d</xliff:g> приложения имат разрешение"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Цветови режим за снимките"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Използване на sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Мащаб на показване"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"показване, плътност, промяна на мащаба, мащаб, мащабиране"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Малък"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормален"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Голям"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"По-голям"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Най-голям"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Персонализиран (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 482ed52..87fb000 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ডকে ট্যাবলেট ঢোকাতে বা বের করতে শব্দ প্লে করবেন না"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ডকে ফোন ঢোকাতে বা বের করতে শব্দ প্লে করবেন না"</string>
     <string name="account_settings" msgid="6403589284618783461">"অ্যাকাউন্টগুলি"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ব্যক্তিগত"</string>
-    <string name="category_work" msgid="8699184680584175622">"কর্মক্ষেত্র"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"কাজের প্রোফাইল অ্যাকাউন্টগুলি - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ব্যক্তিগত প্রোফাইল অ্যাকাউন্টগুলি"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"কাজের অ্যাকাউন্ট - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"অক্ষম করা রয়েছে"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"সবসময় চালু"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"স্বয়ংক্রিয়"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ফাইল এনক্রিপশান রূপান্তর করুন"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"রূপান্তরিত করুন ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ফাইল ইতিমধ্যেই এনক্রিপ্ট করা রয়েছে"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ডেটা পার্টিশানকে ফাইলভিত্তিক এনক্রিপশানে রূপান্তর করুন৷ \n !!সতর্কবাণী!! এটি আপনার সমস্ত ডেটা মুছে ফেলবে৷\n এই বৈশিষ্ট্যটি আলফা এবং সঠিকভাবে কাজ নাও করতে পারে৷ \n চালিয়ে \'মুছুন ও রূপান্তর করুন...\' টিপুন"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"মুছুন ও রূপান্তর করুন..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"নিষ্ক্রিয় রয়েছে"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"স্ক্রীন বন্ধ হয়"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ধরে নিষ্ক্রিয়তার পরে"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"আনপিন করার আগে পিন চান"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"আনপিন করার আগে পাসওয়ার্ড চান"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"আনপিন করার সময় ডিভাইস লক করুন"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"কর্মস্থলের প্রোফাইল"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"এর দ্বারা এই কাজের প্রোফাইলটি পরিচালিত হয়:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> এর দ্বারা পরিচালিত"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(পরীক্ষামূলক)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"উন্নত"</string>
     <string name="configure_apps" msgid="6685680790825882528">"অ্যাপ্লিকেশান কনফিগার করুন"</string>
     <string name="unknown_app" msgid="5275921288718717656">"অজানা অ্যাপ্লিকেশান"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"প্রোফাইল বেছে নিন"</string>
     <string name="app_permissions" msgid="4148222031991883874">"অ্যাপ্লিকেশানের অনুমতি"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান অতিরিক্ত অ্যাক্সেস মঞ্জুরিপ্রাপ্ত"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>টির মধ্যে <xliff:g id="COUNT_0">%d</xliff:g>টি অ্যাপ্লিকেশান মঞ্জুরিপ্রাপ্ত"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ছবি রঙ মোড"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ব্যবহার করুন"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"স্কেল প্রদর্শন করুন"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ঘনত্বের হিসাবে জুম স্কেলের মাপ প্রদর্শন করুন"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ক্ষুদ্র"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"স্বাভাবিক"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"বড়"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"খুব বড়"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"বৃহত্তম"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"কাস্টম (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7526344..efe0b46 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Feina"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes del perfil professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes del perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professional: <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desactivat"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre activat"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automàtic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteix en l\'encriptació de fitxers"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converteix…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"El fitxer ja està encriptat"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converteix la partició de dades en una encriptació basada en fitxers.\n Advertiment: s\'esborraran totes les teves dades.\n Aquesta funció és alfa i és possible que no funcioni correctament.\n Per continuar, prem Esborra i converteix."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Esborra i converteix…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla s\'apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN per anul·lar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya per anul·lar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloqueja el dispositiu en anul·lar la fixació"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil professional"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"L\'administrador d\'aquest perfil professional és:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat per <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura aplicacions"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Triar un perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos d\'aplicacions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacions disposen d\'accés addicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacions permeses"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode de color de la imatge"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilitza sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualització"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visualització densitat zoom escala mida"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petita"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Gran"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Molt gran"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La més gran"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalitzada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 02fe50a..bd00d3f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Při vložení nebo vyjmutí tabletu z doku nepřehrávat zvuk"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nepřehrávat zvuk při vkládání nebo vyjímání telefonu z doku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Účty"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobní"</string>
-    <string name="category_work" msgid="8699184680584175622">"Pracovní"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Účty s pracovním profilem – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Účty s osobním profilem"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Pracovní účet – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Vypnuto"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vždy zapnuto"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatický"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Převést na šifrování souborů"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Převést…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Obsah je již na úrovni souborů zašifrován"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Chystáte se převést datový oddíl na šifrování založené na souborech.\n !!Upozornění!! Všechna vaše data budou vymazána.\n Tato funkce je ve verzi alfa a nemusí fungovat správně.\n Chcete-li pokračovat, vyberte možnost Vymazat a převést…"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Vymazat a převést…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutí obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Před uvolněním požádat o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Před uvolněním požádat o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Při uvolnění uzamknout zařízení"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Pracovní profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovní profil je spravován pomocí aplikace:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravováno aplikací <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentální)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšířená nastavení"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurace aplikací"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznámá aplikace"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Vyberte profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Oprávnění aplikací"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"U <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací povolen rozšířený přístup"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povoleno u <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikací"</string>
@@ -2928,20 +2929,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Režim barev obrázku"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije se barevný prostor sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Měřítko displeje"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"displej hustota přiblížení měřítko"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malé"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normální"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Velké"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Větší"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Největší"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Vlastní (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0ba1378..fa39401 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Afspil ikke lyd, når tabletcomputeren isættes eller fjernes fra dockingstation"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
-    <string name="category_work" msgid="8699184680584175622">"Arbejde"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Arbejdsprofilkonti – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personlig profilkonti"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Arbejdskonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Deaktiveret"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altid slået til"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til filkryptering"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertér…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede filkrypteret"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konvertér datapartitionen til filbaseret kryptering.\nAdvarsel! Alle dine data vil blive slettet.\n Dette er en alfafunktion, og den fungerer muligvis ikke korrekt.\n Tryk på \"Ryd og konvertér…\" for at fortsætte."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Ryd og konvertér…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skærmen slukker"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Bed om pinkode inden frigørelse"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Bed om adgangskode inden frigørelse"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheden ved frigørelse"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbejdsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbejdsprofil administreres af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administreret af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentel)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanceret"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukendt app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Vælg profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Apptilladelser"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har yderligere adgangstilladelse"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ud af <xliff:g id="COUNT_1">%d</xliff:g> apps har tilladelse"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farvetilstand for billeder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Brug sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Visningsskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visningstæthed zoom skala skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Lille"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stor"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Større"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Størst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tilpasset (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 623f445..75ebb5b 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -812,8 +812,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Beim Anschließen oder Trennen des Tablets vom Dock keinen Sound abspielen"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konten"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Nutzer"</string>
-    <string name="category_work" msgid="8699184680584175622">"Geschäftlich"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Konten für Arbeitsprofil – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Konten für persönliches Profil"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Arbeitskonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -836,6 +834,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Deaktiviert"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Immer an"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Zu Dateiverschlüsselung wechseln"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Wechseln…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dateiverschlüsselung wird bereits verwendet."</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Wechseln Sie von Datenpartitions- zu dateibasierter Verschlüsselung.\n !!Achtung!! Dadurch werden alle Ihre Daten gelöscht.\n Es handelt sich um eine Alphaversion, die möglicherweise nicht korrekt funktioniert.\n Wählen Sie \"Wischen und wechseln…\" aus, um fortzufahren."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wischen und wechseln…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Display wird ausgeschaltet."</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
@@ -2641,7 +2644,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vor Beenden nach PIN fragen"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vor dem Beenden nach Passwort fragen"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Gerät beim Beenden sperren"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbeitsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dieses Arbeitsprofil wird verwaltet von:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Verwaltet von <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
@@ -2726,7 +2728,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Erweitert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps konfigurieren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unbekannte App"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil auswählen"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App-Berechtigungen"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps haben zusätzliche Zugriffsrechte."</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> von <xliff:g id="COUNT_1">%d</xliff:g> Apps sind berechtigt."</string>
@@ -2885,20 +2886,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farbmodus für Bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB verwenden"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Displaymaßstab"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display dichte zoom maßstab skalierung"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Klein"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Mittel"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Groß"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Größer"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Am größten"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Benutzerdefiniert (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 53dbcb6..f19aea5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
     <string name="account_settings" msgid="6403589284618783461">"Λογαριασμοί"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Προσωπικό"</string>
-    <string name="category_work" msgid="8699184680584175622">"Εργασία"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Λογαριασμοί προφίλ εργασίας - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Λογαριασμοί προσωπικών προφίλ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Λογαριασμός εργασίας - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Ανενεργό"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Πάντα ενεργό"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Αυτόματο"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Μετατροπή σε κρυπτογράφηση αρχείου"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Μετατροπή …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Με κρυπτογράφηση αρχείου"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Μετατροπή τμήματος δεδομένων σε κρυπτογράφηση βάσει αρχείου.\n !!Προσοχή!! Με αυτή την ενέργεια, θα διαγραφούν όλα τα δεδομένα σας.\n Αυτή η λειτουργία βρίσκεται σε δοκιμαστικό στάδιο alpha και ενδέχεται να μην λειτουργεί σωστά.\n Πατήστε \"Εκκαθάριση και μετατροπή…\" για να συνεχίσετε."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Εκκαθάριση και μετατροπή…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Χρόνος αδράνειας"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Η οθόνη απενεργοποιείται"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Να ζητείται το PIN πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Να ζητείται κωδικός πρόσβασης πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Κλείδωμα της συσκευής κατά το ξεκαρφίτσωμα"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Προφίλ εργασίας"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Η διαχείριση αυτού του προφίλ γίνεται από:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Διαχείριση από <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Πειραματικό)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Σύνθετες ρυθμίσεις"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Διαμόρφωση εφ/γών"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Άγνωστη εφαρμογή"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Επιλογή προφίλ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Δικαιώματα εφαρμογών"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Επιτρέπεται επιπλέον πρόσβαση σε <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμ."</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Επιτρέπονται <xliff:g id="COUNT_0">%d</xliff:g> από <xliff:g id="COUNT_1">%d</xliff:g> εφαρμογές"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Λειτουργία χρώματος εικόνας"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Χρήση sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Κλίμακα προβολής"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"κλιμάκωση κλίμακας εστίασης πυκνότητας προβολής"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Μικρά"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Κανονικά"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Μεγάλα"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Πιο μεγάλα"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Μεγαλύτερα"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Προσαρμοσμένη (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index dabe1a6..a26efc7 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convert ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convert data partition to file based encryption.\n !!Warning!! This will erase all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert...\' to continue."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wipe and convert..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index dabe1a6..a26efc7 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convert ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convert data partition to file based encryption.\n !!Warning!! This will erase all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert...\' to continue."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wipe and convert..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index dabe1a6..a26efc7 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Don\'t play sound when inserting or removing tablet from dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Don\'t play sound when inserting or removing phone from dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Work"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work profile accounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personal profile accounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work account - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disabled"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Always on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatic"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convert ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convert data partition to file based encryption.\n !!Warning!! This will erase all your data.\n This feature is alpha, and may not work correctly.\n Press \'Wipe and convert...\' to continue."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wipe and convert..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Screen turns off"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lock device when unpinning"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Work profile"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"This work profile is managed by:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Managed by <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configure apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Unknown app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Choose Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App permissions"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed additional access"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> of <xliff:g id="COUNT_1">%d</xliff:g> apps allowed"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Picture colour mode"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Display scale"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale scaling"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Small"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Large"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Larger"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Largest"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 98f7f09..53ac776 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reproducir sonido cuando se inserte o elimine un tablet de la base."</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reproducir sonido al insertar o retirar el dispositivo de la base."</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabajo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Cuentas de perfil de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Cuentas de perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cuenta de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inhabilitado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Siempre activado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a encriptación de archivo"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convertir…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está encriptado"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convierte la partición de datos en una encriptación basada en archivos.\n Advertencia: Esta acción borrará todos los datos.\n Esta función se encuentra en fase Alfa y es posible que no funcione correctamente.\n Para continuar, presiona \"Limpiar y convertir…\"."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Limpia y convierte…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Cuando se apaga la pantalla"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -2638,7 +2641,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para quitar fijación"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para quitar fijación"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al quitar fijación"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"La siguiente aplicación administra este perfil de trabajo:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2723,7 +2725,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Elegir perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplic. con permiso de acceso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
@@ -2880,20 +2881,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de la imagen"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usa sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualización"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"configuración de la escala de zoom de densidad de la pantalla"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequeña"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Más grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Máxima"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c5b31c9..c1aa936 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"No reproducir sonido al insertar o extraer el tablet de la base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"No reproducir sonido al insertar o extraer el teléfono de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabajo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Cuentas de perfil de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Cuentas de perfil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cuenta de trabajo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inhabilitado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Siempre activado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a cifrado de archivo"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convertir..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está cifrado"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convierte la partición de datos en un cifrado basado en archivos.\n Advertencia: Este proceso borrará todos los datos.\n Esta función es alpha y es posible que no funcione correctamente.\n Pulsa la opción Borrar y convertir para continuar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Borrar y convertir..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"La pantalla se apaga"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar PIN para desactivar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar contraseña para desactivar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo al desactivar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabajo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabajo está administrado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Opciones avanzadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicaciones"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación desconocida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicaciones"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones tienen permitidos accesos adicionales"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicaciones permitidas"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 180d074..3527e58 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ära esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ära esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontod"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Isiklik"</string>
-    <string name="category_work" msgid="8699184680584175622">"Töö"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Tööprofiili kontod – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Isikliku profiili kontod"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Töökonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Keelatud"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alati sees"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automaatne"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Teisendamine failikrüpteeringuga andmeteks"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Teisenda ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Juba failikrüpteeringuga"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Teisendage andmete sektsioon failipõhiseks krüpteeringuks.\n !!Hoiatus!! See kustutab kõik teie andmed.\n See funktsioon on alfaversioonis ega pruugi õigesti töötada.\n Jätkamiseks vajutage nuppu „Kustuta ja teisenda ...”."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Kustuta ja teisenda ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekraan lülitub välja"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Enne vabastamist küsi PIN-koodi"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Enne vabastamist küsi parooli"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Vabastamise korral lukusta seade"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Tööprofiil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Seda tööprofiili hallatakse rakendusega"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Haldab <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Katseline)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Rakenduste seadistamine"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profiili valimine"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Rakenduse load"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> rakendusel <xliff:g id="COUNT_1">%d</xliff:g>-st on täiendav juurdepääs"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> rakendust <xliff:g id="COUNT_1">%d</xliff:g>-st on lubatud"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index f54b149..817ae33 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ez erreproduzitu soinua tableta oinarrira konektatzean edo handik kentzean"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ez erreproduzitu soinua telefonoa oinarrira eranstean edo handik kentzean."</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontuak"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pertsonalak"</string>
-    <string name="category_work" msgid="8699184680584175622">"Lanekoak"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Laneko profilaren kontuak - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Profil pertsonalen kontuak"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Laneko kontua - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desgaituta"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Beti aktibatuta"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatikoa"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Eman fitxategietan oinarritutako enkriptatzea"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Enkriptatu…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fitxategietan oinarritutako enkriptatzea dauka dagoeneko"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Eman datuen partizioari fitxategietan oinarritutako enkriptatzea.\n !!Kontuz!! Ekintza horrek ezabatu egingo ditu datu guztiak.\n Eginbidearen alpha bertsioa da; beraz, baliteke behar bezala ez funtzionatzea.\n Aurrera egiteko, sakatu \"Ezabatu eduki guztia eta enkriptatu…\"."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Ezabatu eduki guztia eta enkriptatu…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ezarri egonean moduan"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pantaila itzaltzen da"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktibo egon ondoren"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Eskatu PIN kodea aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Eskatu pasahitza aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blokeatu gailua aingura kentzean"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Laneko profila"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Laneko profil hau honen bidez kudeatzen da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kudeatzailea: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Ezarpen aurreratuak"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguratu aplikazioak"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikazio ezezaguna"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Aukeratu profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Aplikaziorako baimenak"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikaziok sarbide gehigarria dute"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> aplikazio baimenduta"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Irudiaren kolore modua"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Erabili sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Pantailaren eskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"pantaila dentsitatea zooma eskala tamaina"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Txikia"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normala"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Handia"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Oso handia"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Handiena"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Pertsonalizatua (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 12c2396..e242e88 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"هنگام اتصال یا جدا کردن رایانهٔ لوحی از جایگاه، صدا پخش نشود"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"هنگام اتصال یا جدا کردن گوشی از دستگاه، صدا پخش نشود"</string>
     <string name="account_settings" msgid="6403589284618783461">"حساب‌ها"</string>
-    <string name="category_personal" msgid="1299663247844969448">"شخصی"</string>
-    <string name="category_work" msgid="8699184680584175622">"محل کار"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"حساب‌های نمایه کاری - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"حساب‌های نمایه شخصی"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"حساب کاری - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"غیرفعال است"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"همیشه روشن"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"تبدیل به رمزگذاری برحسب فایل"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"تبدیل..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"از قبل به رمزگذاری بر حسب فایل تبدیل شده است"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"تبدیل پارتیشن داده‌ای به رمزگذاری بر حساب فایل.\n !!هشدار!! این کار تمام داده‌هایتان را حذف می‌کند.\n این ویژگی در نسخه آلفا قرار دارد و ممکن است به درستی کار نکند.\n برای ادامه، «پاکسازی و تبدیل...» را فشار دهید."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"پاکسازی و تبدیل..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"صفحه نمایش خاموش می‌شود"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"درخواست کد پین قبل از برداشتن پین"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"درخواست گذرواژه قبل از برداشتن پین"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل کردن دستگاه هنگام برداشتن پین"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"نمایه کاری"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"سرپرست زیر این نمایه کاری را مدیریت می‌کند:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"مدیریت شده توسط <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(آزمایشی)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"پیشرفته"</string>
     <string name="configure_apps" msgid="6685680790825882528">"پیکربندی برنامه‌ها"</string>
     <string name="unknown_app" msgid="5275921288718717656">"برنامه ناشناخته"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"انتخاب نمایه"</string>
     <string name="app_permissions" msgid="4148222031991883874">"مجوزهای برنامه"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه اجازه دسترسی اضافی دارد"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> برنامه مجاز است"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"حالت رنگ عکس"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏استفاده از sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"مقیاس نمایش"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"نمایشگر تراکم بزرگ‌نمایی مقیاس مقیاس‌بندی"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"کوچک"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"معمولی"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"بزرگ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"بزرگ‌تر"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"بزرگ‌ترین"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"سفارشی (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 3891884..cf58c31 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Älä toista ääntä, kun tabletti asetetaan telakkaan tai poistetaan telakasta"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tilit"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Henkilökohtainen"</string>
-    <string name="category_work" msgid="8699184680584175622">"Työ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Työprofiilit – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Henkilökohtaiset profiilit"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Työtili – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Ei käytössä"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Aina käytössä"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automaattinen"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Muunna tiedostojen salaukseksi"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Muunna…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tiedostot on jo salattu."</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Muunna dataosio tiedostopohjaiseksi salaukseksi.\n Varoitus! Kaikki tiedot poistetaan.\n Tämä ominaisuus on alfavaiheessa eikä välttämättä toimi oikein.\n Jatka painamalla Poista ja muunna…"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Poista ja muunna…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Siirtyminen virransäästöön"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Näyttö sammuu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pyydä PIN ennen irrotusta"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pyydä salasana ennen irrotusta"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lukitse laite irrotuksen aikana"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Työprofiili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tätä työprofiilia hallinnoi"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hallinnoija: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kokeellinen)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Lisäasetukset"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Sovellusten konfigurointi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tuntematon sovellus"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Valitse profiili"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Sovelluksen käyttöoikeudet"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> sovelluksella on ylimääräinen käyttöoikeus"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g> sovelluksella käyttöoikeus"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Kuvien värit"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Ota sRGB käyttöön"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Näytön skaalaus"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"näytön tiheys zoomaus skaala skaalaus"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pieni"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normaali"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Suuri"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Suurempi"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Suurin"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Muokattu (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 75c3afd..e6c59f5 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
-    <string name="category_work" msgid="8699184680584175622">"Travail"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes de profil professionnel - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes de profil personnel"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professionnel - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Désactivé"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Toujours actif"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement basé sur un fichier"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Conversion en cours..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré par un fichier"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convertir la partition de données en chiffrement basé sur un fichier\n Avertissement! Cette opération supprimera toutes vos données. \nCette fonctionnalité est en version alpha et peut ne pas fonctionner correctement. \nTouchez « Effacer et convertir » pour continuer."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Effacer et convertir..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander le NIP avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'écran après l\'annulation de l\'épinglage"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le profil professionnel est géré par :"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimentale)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applications"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Sélectionnez un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autorisations de l\'application"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode couleur des images"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Échelle d\'affichage"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densité d\'affichage zoom mise à l\'échelle échelle"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petite"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Plus grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La plus grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personnalisée (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5cf46da..892f8c8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
     <string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
-    <string name="category_work" msgid="8699184680584175622">"Professionnel"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Comptes de profils professionnels – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Comptes de profils personnels"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Compte professionnel – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Désactivé"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Toujours activé"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatique"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement basé sur un fichier"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convertir..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré via un fichier"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Convertir la partition de données en chiffrement basé sur un fichier\n Avertissement ! Cette opération supprimera toutes vos données.\n Cette fonctionnalité est en version alpha et peut ne pas fonctionner correctement.\n Appuyez sur \"Effacer et convertir\" pour continuer."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Effacer et convertir..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"L\'écran s\'éteint"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander code PIN avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'appareil lors de l\'annulation de l\'épinglage"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil professionnel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ce profil professionnel est géré par"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Paramètres avancés"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurer les applis"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Application inconnue"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Sélectionner un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autoris. des applis"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> applis autorisées avec accès supplém. sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> applications autorisées sur <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode de couleur des images"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Échelle d\'affichage"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densité d\'affichage zoom mise à l\'échelle échelle"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Petite"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Plus grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"La plus grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personnalisée (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 1413c60..3f063c4 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Non reproduce son ao inserir ou retirar o tablet da base"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Non reproduce ningún son ao inserir ou extraer o teléfono da base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Traballo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de traballo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil persoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta do traballo (<xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desactivado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre activada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter no encriptado baseado en ficheiros"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Xa se encriptou o ficheiro"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converte a partición de datos nun encriptado baseado en ficheiros.\n Advertencia: Esta acción borrará todos os datos.\n Esta función é alfa e quizais non funcione correctamente.\n Toca \"Borrar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Borrar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensión"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A pantalla apágase"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Despois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividade"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitar un PIN antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitar un contrasinal antes de soltar a pantalla"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar a pantalla"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil do traballo"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de traballo está xestionado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Xestionado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicacións"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Seleccionar perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicacións"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso de acceso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicacións con permiso"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imaxe"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de visualización"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"visualización densidade escala"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Máis grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"A máis grande"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml
index e9dc86a..40463fa 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ટેબ્લેટને ડૉકમાં શામેલ કરતી અથવા દૂર કરતી વખતે ધ્વનિ ચલાવશો નહીં"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ફોનને ડૉકમાં શામેલ કરતી અથવા દૂર કરતી વખતે ધ્વનિ ચલાવશો નહીં"</string>
     <string name="account_settings" msgid="6403589284618783461">"એકાઉન્ટ્સ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"વ્યક્તિગત"</string>
-    <string name="category_work" msgid="8699184680584175622">"કાર્યાલય"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"કાર્ય પ્રોફાઇલ એકાઉન્ટ્સ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"વ્યક્તિગત પ્રોફાઇલ એકાઉન્ટ્સ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"કાર્ય એકાઉન્ટ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"અક્ષમ કરેલ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"હંમેશાં ચાલુ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"સ્વચલિત"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ફાઇલ એન્ક્રિપ્શનમાં રૂપાંતરિત કરો"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"રૂપાંતરિત કરો..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ફાઇલ પહેલેથી જ એન્ક્રિપ્ટ કરેલ છે"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ડેટા પાર્ટીશનને ફાઇલ આધારિત એન્ક્રિપ્શનમાં રૂપાંતરિત કરો.\n !!ચેતવણી!! આ તમારો બધો ડેટા કાઢી નાખશે.\n આ સુવિધા આલ્ફા છે અને યોગ્ય રીતે કામ ન કરે તેવું બની શકે.\n ચાલુ રાખવા માટે ‘સાફ અને રૂપાંતરિત કરો...’ દબાવો."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"સાફ અને રૂપાંતરિત કરો..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"નિષ્ક્રિય થાઓ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"સ્ક્રીન બંધ કરે છે"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"નિષ્ક્રિયતાનાં <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> પછી"</string>
@@ -2642,7 +2645,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"અનપિન કરતાં પહેલાં PIN માટે પૂછો"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"અનપિન કરતાં પહેલાં પાસવર્ડ માટે પૂછો"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ઉપકરણને અનપિન કરતી વખતે લૉક કરો"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"કાર્ય પ્રોફાઇલ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"આ કાર્ય પ્રોફાઇલ આમના દ્વારા સંચાલિત થાય છે:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> દ્વારા સંચાલિત"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(પ્રાયોગિક)"</string>
@@ -2727,7 +2729,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"વિગતવાર"</string>
     <string name="configure_apps" msgid="6685680790825882528">"એપ્લિકેશનો ગોઠવો"</string>
     <string name="unknown_app" msgid="5275921288718717656">"અજાણી એપ્લિકેશન"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"પ્રોફાઇલ પસંદ કરો"</string>
     <string name="app_permissions" msgid="4148222031991883874">"એપ્લિકેશન પરવાનગીઓ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> માંથી <xliff:g id="COUNT_1">%d</xliff:g> એપ્લિકેશન્સને અતિરિક્ત ઍક્સેસની મંજૂરી છે"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> માંથી <xliff:g id="COUNT_0">%d</xliff:g> એપ્લિકેશન્સને મંજૂરી છે"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index fa90d2e..303460c 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉक में टेबलेट सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉक में फ़ोन सम्‍मिलित करते या निकालते समय ध्‍वनि न चलाएं"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाते"</string>
-    <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string>
-    <string name="category_work" msgid="8699184680584175622">"कार्यालय"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफ़ाइल खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्‍यक्‍तिगत प्रोफ़ाइल खाते"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्यस्‍थल खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"अक्षम"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"हमेशा चालू"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फ़ाइल एन्क्रिप्शन में रूपांतरित करें"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"रूपांतरित करें ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"फ़ाइल पहले से एन्क्रिप्ट की हुई है"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"डेटा विभाजन को फ़ाइल आधारित एन्क्रिप्शन में रूपांतरित करें.\n !!चेतावनी!! इससे आपका सभी डेटा मिट जाएगा.\n यह सुविधा अल्फ़ा स्थिति में है और ठीक से कार्य नहीं कर सकती.\n जारी रखने के लिए \'वाइप करें और रूपांतरित करें...\' दबाएं."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"वाइप करें और रूपांतरित करें..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद हो जाती है"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"नि‍ष्‍क्रि‍यता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करने से पहले पिन के लिए पूछें"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करते समय डिवाइस लॉक करें"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफ़ाइल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यह कार्य प्रोफ़ाइल इनके द्वारा प्रबंधित की जाती है:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा प्रबंधित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"अतिरिक्‍त सेटिंग"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ऐप्स कॉन्‍फ़िगर करें"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात ऐप"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफ़ाइल चुनें"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ऐप अनुमतियां"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अतिरिक्त एक्सेस की अनुमति है"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> में से <xliff:g id="COUNT_0">%d</xliff:g> ऐप्स को अनुमति है"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index bdef928..ce0d88d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -819,8 +819,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
     <string name="account_settings" msgid="6403589284618783461">"Računi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobno"</string>
-    <string name="category_work" msgid="8699184680584175622">"Posao"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Računi radnih profila – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Računi osobnih profila"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Radni račun – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +841,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Onemogućeno"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Uvijek uključeno"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatska"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u enkripciju datoteka"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Pretvori..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkripcija datoteka već je izvršena"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Pretvorite podatkovnu particiju u enkripciju datoteka.\n Upozorenje! Time će se izbrisati svi vaši podaci.\n Značajka je u alfa verziji i možda neće funkcionirati pravilno.\n Pritisnite \"Izbriši i pretvori...\" da biste nastavili."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Izbriši i pretvori..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se isključuje"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kada prođe <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
@@ -2657,7 +2660,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Traži PIN radi otkvačivanja"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Traži zaporku radi otkvačivanja"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zaključaj uređaj prilikom otkvačivanja"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Radni profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ovim radnim profilom upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
@@ -2745,7 +2747,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Napredno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguranje aplikacija"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nepoznata aplikacija"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Odabir profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dozvole aplikacijama"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Broj aplikacija s dodatnim pristupom: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Broj aplikacija s dopuštenjem: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2905,20 +2906,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Način boje slike"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Upotrijebi sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala prikaza"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"prikaz gustoća zumiranje skala skaliranje"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malo"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Uobičajeno"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veliko"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Veće"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Najveće"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Prilagođeno (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6d0029d..8201919 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne legyen hangjelzés a táblagépnek a dokkba történő behelyezésekor vagy onnan eltávolításakor"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne játsszon le hangot a telefon dokkolóba helyezésekor és kivételekor"</string>
     <string name="account_settings" msgid="6403589284618783461">"Fiókok"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Személyes"</string>
-    <string name="category_work" msgid="8699184680584175622">"Munkahelyi"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"„Munkaprofil” fiókok – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"„Személyes profil” fiókok"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Munkahelyi fiók – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Kikapcsolva"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Mindig bekapcsolva"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatikus"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertálás fájl alapú titkosításra"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertálás…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Már fájl alapú titkosítást használ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konvertálja az adat alapú titkosítást használó partíciót fájl alapú titkosítást használóvá.\n FIGYELEM! A művelet minden adatot töröl.\n A funkció alfatesztelésben van, és lehet, hogy nem megfelelően működik.\n Nyomja meg a „Törlés és konvertálás…” lehetőséget a folytatáshoz."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Törlés és konvertálás…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A kijelző kikapcsol"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kód kérése a feloldáshoz"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Jelszó kérése a rögzítés feloldásához"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Eszköz zárolása a rögzítés feloldásakor"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Munkaprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"A munkahelyi profil kezelője:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Kezeli: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Kísérleti)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Speciális"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Alkalmazások konfigurálása"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ismeretlen alkalmazás"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil kiválasztása"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Engedélyek"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás kapott további hozzáférést"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>/<xliff:g id="COUNT_0">%d</xliff:g> alkalmazás kapott engedélyt"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Kép színe mód"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB használata"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Megjelenítés méret"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"kijelző, sűrűség, nagyítás/kicsinyítés, méret, méretezés"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kicsi"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normál"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Nagy"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Nagyobb"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Legnagyobb"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Egyéni (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index bebafab..01043dd 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ձայնային ազդանշաններ չհնչեցնել գրասալիկը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ձայնային ազդանշան չհնչեցնել հեռախոսը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
     <string name="account_settings" msgid="6403589284618783461">"Հաշիվներ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Անձնական"</string>
-    <string name="category_work" msgid="8699184680584175622">"Աշխատանքային"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Աշխատանքային պրոֆիլների հաշիվներ՝ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Անձնական պրոֆիլի հաշիվներ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Աշխատանքային հաշիվ՝ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Անջատված"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Միշտ միացված"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Ավտոմատ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Վերածել ֆայլային գաղտնագրման"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Փոխարկել ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ֆայլային գաղտնագրումն արդեն կատարվել է"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Ստեղծեք ֆայլային գաղտնագրում՝ փոխարկելով տվյալների բաժինը:\n !!Ուշադրություն!! Ձեր բոլոր տվյալները կջնջվեն:\n Այս գործառույթը դեռ գտնվում է փորձարկման փուլում և հնարավոր է ճիշտ չաշխատի:\n Շարունակելու համար սեղմեք «Սրբել և փոխարկել...» կոճակը:"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Սրբել և փոխարկել..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Քնել"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Էկրանը անջատվում է"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> պասիվ լինելուց հետո"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ապամրացման ժամանակ կողպել սարքը"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Աշխատանքային պրոֆիլ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Այս աշխատանքային պրոֆիլը կառավարվում է այս հավելվածի օգնությամբ՝"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Կառավարիչ՝ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Հավելվածների կազմաձևում"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Հավելվածների թույլտվությունները"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Ընդլայնված հասանելիություն ունեցող հավելվածներ՝ <xliff:g id="COUNT_1">%d</xliff:g>-ը <xliff:g id="COUNT_0">%d</xliff:g>-ից"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Թույլատրված է <xliff:g id="COUNT_0">%d</xliff:g> հավելվածի՝ <xliff:g id="COUNT_1">%d</xliff:g>-ից"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Նկարի գունային ռեժիմ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Օգտագործել sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ցուցադրման սանդղակ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ցուցադրում խտություն մասշտաբ սանդղակ մասշտաբավորում"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Փոքր"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Սովորական"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Մեծ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Ավելի մեծ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Ամենամեծ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Հատուկ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e9de50a..3136781 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Jangan memutar suara saat memasukkan atau melepaskan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akun"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pribadi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Kantor"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akun profil kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akun profil pribadi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akun kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dinonaktifkan"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Selalu aktif"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatis"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konversi ke enkripsi file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konversi ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah dienkripsi berbasis file"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konversi partisi data ke enkripsi berbasis file.\n !!Peringatan!! Tindakan ini akan menghapus semua data.\n Fitur ini tahap alfa dan mungkin tidak berfungsi dengan benar.\n Tekan \'Hapus dan konversi...\' untuk melanjutkan."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Hapus dan konversi..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Layar mati"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum lepas pin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta sandi sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci perangkat saat melepas pin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini dikelola oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Dikelola oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Lanjutan"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasi aplikasi"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikasi tak dikenal"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Izin aplikasi"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan akses tambahan"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> dari <xliff:g id="COUNT_1">%d</xliff:g> aplikasi diizinkan"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode warna gambar"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gunakan sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala layar"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"layar kepadatan zoom skala penskalaan"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kecil"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Biasa"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Besar"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lebih besar"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Terbesar"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"(<xliff:g id="DENSITYDPI">%d</xliff:g>) khusus"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 1b4076f..e102f97 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ekki spila hljóð þegar spjaldtölva er sett í eða tekin úr dokku"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ekki spila hljóð þegar sími er settur í eða tekinn úr dokku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Reikningar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persónulegt"</string>
-    <string name="category_work" msgid="8699184680584175622">"Vinna"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Reikningar vinnusniðs – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Reikningar eigin sniðs"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Vinnureikningur – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Óvirkt"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltaf kveikt"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Sjálfvirkt"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Umbreyta í dulkóðun skráa"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Umbreyta..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Þegar dulkóðað á grundvelli skráa"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Umbreyting gagnaskiptingar í dulkóðun á grundvelli skráa.\n !!Viðvörun!! Þetta eyðir öllum gögnunum þínum.\nÞetta er tilraunaeiginleiki og virkar hugsanlega ekki rétt.\nÝttu á „Þurrka út og umbreyta...“ til að halda áfram."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Þurrka út og umbreyta..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvíld"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Slökkt er á skjánum"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Eftir <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> af aðgerðaleysi"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Biðja um PIN-númer til að losa"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Biðja um aðgangsorð til að losa"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Læsa tækinu við losun"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Vinnusnið"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Þessu vinnusniði er stjórnað af:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Stjórnað af <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tilraun)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Ítarlegt"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Stillingar forrita"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Óþekkt forrit"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Veldu snið"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Heimildir forrits"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum veittur frekari aðgangur"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> af <xliff:g id="COUNT_1">%d</xliff:g> forritum leyfð"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Litastilling mynda"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Nota sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skjástærð"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skjár þéttleiki aðdráttur stærð"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Lítið"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Venjulegt"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stórt"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Stærra"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Stærst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Sérsniðið (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2c09ed7..04a58d0 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Non riprodurre suono all\'inserimento o alla rimozione del tablet dal dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Non riprodurre suono all\'inserimento o alla rimozione del telefono dal dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Account"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personali"</string>
-    <string name="category_work" msgid="8699184680584175622">"Lavoro"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Account di profili di lavoro - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Account di profili personali"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Account di lavoro - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Disattivato"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre attivo"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatico"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converti in crittografia basata su file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converti..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Crittografia su base file già eseguita"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converti la partizione di dati in crittografia basata su file.\n Attenzione. Questa operazione eliminerà tutti i tuoi dati.\n Questa funzione è in versione alpha, perciò potrebbe non funzionare correttamente.\n Premi \"Cancella e converti...\" per continuare."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Cancella e converti..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Lo schermo si spegne"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Richiedi il PIN per lo sblocco"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Richiedi password prima di sbloccare"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocca dispositivo per sblocco"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profilo di lavoro"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Questo profilo di lavoro è gestito da:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestito da <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Sperimentale)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avanzate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Applicazione sconosciuta"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Scegli profilo"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Autorizzazioni app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"A <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g> è stato autorizzato un ulteriore accesso"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Sono consentite <xliff:g id="COUNT_0">%d</xliff:g> app su <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modalità colori immagini"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Use sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scala display"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"compattezza zoom scala ridimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Piccola"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Più grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Massima"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizzata (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index ce04380..a234c5d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"אל תשמיע צלילים בעת הכנסת הטאבלט לעגינה או הסרתו משם"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"אל תפעיל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מעגינה"</string>
     <string name="account_settings" msgid="6403589284618783461">"חשבונות"</string>
-    <string name="category_personal" msgid="1299663247844969448">"אישי"</string>
-    <string name="category_work" msgid="8699184680584175622">"עבודה"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"חשבונות פרופיל עבודה - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"חשבונות פרופיל אישי"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"חשבון עבודה - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"מושבת"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"פועל תמיד"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"באופן אוטומטי"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"המר להצפנת קבצים"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"המר ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"הצפנת קבצים כבר מוגדרת"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"המר את מחיצת הנתונים להצפנה מבוססת-קבצים.\n !!אזהרה!! הפעולה תמחק את כל הנתונים שלך.\n תכונה זו נכללת בגרסת אלפא וייתכן שהיא לא תפעל כראוי.\n הקש על \'מחק והמר...\' כדי להמשיך."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"מחק והמר..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"שינה"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"כיבוי מסך"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
@@ -2676,7 +2679,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏בקש PIN לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"בקש סיסמה לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"נעל מכשיר בזמן ביטול הצמדה"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"פרופיל עבודה"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"פרופיל העבודה הזה מנוהל על ידי:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"מנוהל על ידי <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
@@ -2767,7 +2769,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
     <string name="configure_apps" msgid="6685680790825882528">"הגדרת אפליקציות"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"בחר פרופיל"</string>
     <string name="app_permissions" msgid="4148222031991883874">"הרשאות לאפליקציות"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו גישה נוספת"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> מתוך <xliff:g id="COUNT_1">%d</xliff:g> אפליקציות קיבלו הרשאה"</string>
@@ -2930,20 +2931,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"מצב צבע התמונה"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏שימוש ב-sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"קנה מידה של תצוגה"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"תצוגה דחיסות מרחק מתצוגה קנה מידה שינוי גודל"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"קטן"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"רגיל"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"גדול"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"יותר גדול"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"הכי גדול"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"מותאם אישית (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8f17b8b..7e7bcd1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -813,8 +813,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"タブレットのホルダー脱着時に音を鳴らさない"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"携帯のホルダー脱着時に音を鳴らさない"</string>
     <string name="account_settings" msgid="6403589284618783461">"アカウント"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人用"</string>
-    <string name="category_work" msgid="8699184680584175622">"仕事用"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"仕事用プロファイルアカウント - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人用プロファイルアカウント"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"仕事用アカウント - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -837,6 +835,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"無効"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"常にON"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ファイル暗号化に変換する"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"変換..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ファイルは既に暗号化済みです"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"データパーティションをファイルベースの暗号化に変換します。\n 警告: この操作ではユーザーのデータがすべて削除されます。\n この機能はアルファ版であり、正しく機能しないおそれがあります。\n 続行するには[消去して変換]をクリックしてください。"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"消去して変換..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"画面がOFFになったとき"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
@@ -2646,7 +2649,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"画面固定の解除前にPINを要求"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"画面固定の解除前にパスワードを要求"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"画面固定を解除するときに端末をロックする"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"仕事用プロファイル"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"この仕事用プロファイルを管理するアプリ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>によって管理されています"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（試験運用）"</string>
@@ -2731,7 +2733,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"詳細設定"</string>
     <string name="configure_apps" msgid="6685680790825882528">"アプリの設定"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明なアプリ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"プロファイルの選択"</string>
     <string name="app_permissions" msgid="4148222031991883874">"アプリの権限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリに追加アクセスを許可"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>個のアプリを許可"</string>
@@ -2888,20 +2889,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"画像の色モード"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBを使用"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"表示スケール"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"表示 間隔 ズーム スケール スケーリング"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"標準"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"特大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"カスタム（<xliff:g id="DENSITYDPI">%d</xliff:g>）"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index aa5726c..f6fd4cd 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ტაბლეტის სამაგრში დაყენებისას ან მისი სამაგრიდან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ტელეფონის დაყენებისას ან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
     <string name="account_settings" msgid="6403589284618783461">"ანგარიშები"</string>
-    <string name="category_personal" msgid="1299663247844969448">"პირადი"</string>
-    <string name="category_work" msgid="8699184680584175622">"სამსახური"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"სამუშაო პროფილის ანგარიშები - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"პირადი პროფილის ანგარიშები"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"სამუშაო ანგარიში - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"გამორთულია"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ყოველთვის ჩართული"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ავტომატური"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ფაილების დაშიფვრაზე გარდაქმნა"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"გარდაქმნა ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"უკვე დაშიფრულია ფაილების დონეზე"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"მონაცემთა დანაყოფის გარდაქმნა ფაილების დონეზე დაშიფვრაზე.\n ყურადღება!!! ეს მოქმედება ყველა თქვენს მონაცემს ამოშლის.\n ეს ფუნქცია alpha სტადიაშია და შეიძლება არასწორად მუშაობდეს.\n გასაგრძელებლად დააჭირეთ „ამოშლა და გარდაქმნა...“-ს."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ამოშლა და გარდაქმნა..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ეკრანი გამოირთვება"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> განმავლობაში უმოქმედობის შემდეგ"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ფიქსაციის მოხსნამდე PIN-ის მოთხოვნა"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ფიქსაციის მოხსნამდე პაროლის მოთხოვნა"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ჩამაგრების მოხსნიდან მოწყობილობის ჩაკეტვა"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"სამუშაო პროფილი"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ამ სამუშაო პროფილს მართავს:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"მმართველი: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ექსპერიმენტული)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
     <string name="configure_apps" msgid="6685680790825882528">"აპების კონფიგურაცია"</string>
     <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
     <string name="app_permissions" msgid="4148222031991883874">"აპის უფლებები"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> აპლიკაციის დამატებითი წვდომის უფლება"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>-დან <xliff:g id="COUNT_0">%d</xliff:g> დაშვებული აპლიკაცია"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"გამოსახულების ფერების რეჟიმი"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-ს გამოყენება"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"სკალის ჩვენება"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ჩვენება სიმკვრივე მასშტაბირება სკალა სკალირება"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"პატარა"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ჩვეულებრივი"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"დიდი"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"უფრო დიდი"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"უდიდესი"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"მორგებული (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index ddd4301..ef1795c 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Планшетті қондырғыға жалғағанда немесе алғанда дыбысын қосуға болмайды"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Телефонды қондырғыға енгізгенде немесе шығарғанда дыбысын ойнатпау"</string>
     <string name="account_settings" msgid="6403589284618783461">"Есептік жазбалар"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Жеке"</string>
-    <string name="category_work" msgid="8699184680584175622">"Жұмыс"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Жұмыс профилінің есептік жазбалары - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Жеке профиль есептік жазбалары"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жұмыс есептік жазбасы - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Өшірілген"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Әрқашан қосулы"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Aвтоматты"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файлды шифрлауға түрлендіру"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Түрлендіру ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Файл шифрланып қойылған"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Деректер бөлімін файлға негізделген шифрлауға түрлендіру.\n !!Ескерту!! Бұл барлық деректерді өшіреді.\n Бұл мүмкіндік альфа кезеңінде және дұрыс жұмыс істемеуі мүмкін.\n Жалғастыру үшін \"Сүрту және түрлендіру...\" түймесін басыңыз."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Сүрту және түрлендіру..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Ұйқы"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өшеді"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Әрекетсіз <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> тұрған соң"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Босату алдында PIN кодын сұрау"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Босату алдында құпия сөзді сұрау"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Босатқанда құрылғыны бекіту"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Жұмыс профилі"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бұл жұмыс профилін басқаратын:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> арқылы басқарылады"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Эксперименттік)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Қолданбаларды конфигурациялау"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Қолданба рұқсаттары"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбаның <xliff:g id="COUNT_0">%d</xliff:g> қосымша рұқсатқа ие"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> қолданбадан <xliff:g id="COUNT_0">%d</xliff:g> рұқсатқа ие"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Сурет түс режимі"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB пайдалану"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дисплей масштабы"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"дисплей тығыздық масштабтау масштаб масштабтау"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Кішкене"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Қалыпты"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Үлкен"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Үлкенірек"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Ең үлкен"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Арнаулы (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 0bf4936..d12b862 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"កុំ​បន្លឺ​សំឡេង​ពេល​បញ្ចូល ឬ​ដក​កុំព្យូទ័រ​បន្ទះ​​ពី​ការ​ភ្ជាប់"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"កុំ​បន្លឺ​សំឡេង​ពេល​បញ្ចូល ឬ​ដក​ទូរស័ព្ទ​ពី​ការ​ភ្ជាប់"</string>
     <string name="account_settings" msgid="6403589284618783461">"គណនី"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ផ្ទាល់ខ្លួន"</string>
-    <string name="category_work" msgid="8699184680584175622">"កន្លែង​ធ្វើការ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"គណនីប្រវត្តិរូបការងារ៖ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"គណនីប្រវត្តិរូបផ្ទាល់ខ្លួន"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"គណនីការងារ៖ <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"បានបិទ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"បើកជានិច្ច"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ស្វ័យប្រវត្តិ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"បម្លែងទៅជាការអ៊ីនគ្រីបឯកសារ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"បម្លែង ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"បានអ៊ីនគ្រីបឯកសាររួចហើយ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"បម្លែងការបែងចែកទិន្នន័យទៅជាការអ៊ីនគ្រីបដោយផ្អែកលើឯកសារ។\n !!ព្រមាន!! សកម្មភាពនេះនឹងលុបទិន្នន័យរបស់អ្នកទាំងអស់\n លក្ខណៈពិសេសនេះជាការសាកល្បងដំបូង និងអាចនឹងដំណើរការមិនប្រក្រតី។\n សូមចុច \'សម្អាត និងបម្លែង...\' ដើម្បីបន្ត។"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"សម្អាត និងបម្លែង..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"អេក្រង់​បិទ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"បន្ទាប់​ពី​អសកម្ម <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"សួរ​រក​កូដ PIN មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"សួរ​រក​ពាក្យ​សម្ងាត់​មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ចាក់​សោ​ឧបករណ៍​ពេល​មិន​ភ្ជាប់"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ប្រវត្តិរូប​ការងារ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ប្រវត្តិរូបការងារនេះត្រូវបានគ្រប់គ្រងដោយ៖"</string>
     <string name="managing_admin" msgid="8843802210377459055">"គ្រប់គ្រងដោយ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ពិសោធន៍​)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="configure_apps" msgid="6685680790825882528">"កំណត់រចនាសម្ព័ន្ធកម្មវិធី"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
     <string name="app_permissions" msgid="4148222031991883874">"សិទ្ធិ​កម្មវិធី"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"កម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g> បានអនុញ្ញាតការចូលប្រើបន្ថែម"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"បានអនុញ្ញាតកម្មវិធី <xliff:g id="COUNT_0">%d</xliff:g> នៃ <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"របៀបនៃពណ៌រូបភាព"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ប្រើ sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"មាត្រដ្ឋានអេក្រង់"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ការកំណត់មាត្រដ្ឋានពង្រីកដង់ស៊ីតេអេក្រង់"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"តូច"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ធម្មតា"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ធំ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ធំជាង"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ធំបំផុត"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ផ្ទាល់ខ្លួន (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index d487411..401aaea 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸೇರಿಸುವಾಗ ಅಥವಾ ಡಾಕ್‌ನಿಂದ ತೆಗೆದುಹಾಕುವಾಗ ಶಬ್ದವನ್ನು ಪ್ಲೇ ಮಾಡದಿರು"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ಫೋನ್‌ ಅನ್ನು ಡಾಕ್‌ಗೆ ಸೇರಿಸುವಾಗ ಅಥವಾ ತೆಗೆದುಹಾಕುವಾಗ ಧ್ವನಿಯನ್ನು ಪ್ಲೇ ಮಾಡಬೇಡಿ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ಖಾತೆಗಳು"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ವೈಯಕ್ತಿಕ"</string>
-    <string name="category_work" msgid="8699184680584175622">"ಕೆಲಸದ ಸ್ಥಳ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ಕೆಲಸ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ವೈಯಕ್ತಿಕ ಪ್ರೊಫೈಲ್ ಖಾತೆಗಳು"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ಕೆಲಸದ ಖಾತೆ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ಯಾವಾಗಲೂ ಆನ್"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ಸ್ವಯಂಚಾಲಿತ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ಫೈಲ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಪರಿವರ್ತಿಸು"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"ಪರಿವರ್ತಿಸು ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ಫೈಲ್ ಈಗಾಗಲೇ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ಡೇಟಾ ವಿಭಜನೆಯನ್ನು ಫೈಲ್ ಆಧಾರಿತ ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಆಗಿ ಪರಿವರ್ತಿಸಿ.\n !!ಎಚ್ಚರಿಕೆ!! ಇದು ನಿಮ್ಮ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ.\n ಈ ವೈಶಿಷ್ಟ್ಯವು ಆಲ್ಫಾ ಆಗಿರುತ್ತದೆ ಮತ್ತು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು.\n ಮುಂದುವರಿಸಲು \'ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು...\' ಒತ್ತಿರಿ."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ಸ್ಲೀಪ್‌"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ಪರದೆ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ನಿಷ್ಕ್ರಿಯತೆಯ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ನಂತರ"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ಅನ್‌ಪಿನ್‌ ಮಾಡಲು ಪಿನ್‌ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ಅನ್‌ಪಿನ್ ಮಾಡಲು ಪಾಸ್‌ವರ್ಡ್ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ಅನ್‌ಪಿನ್ ಮಾಡುವಾಗ ಸಾಧನ ಲಾಕ್ ಮಾಡು"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ಈ ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್ ಅನ್ನು ಇವರು ನಿರ್ವಹಿಸುತ್ತಿದ್ದಾರೆ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ಪ್ರಾಯೋಗಿಕ)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"ಸುಧಾರಿತ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ಅಪ್ಲಿಕೇಶನ್‌ ಕಾನ್ಫಿಗರ್‌"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ಅಜ್ಞಾತ ಅಪ್ಲಿಕೇಶನ್"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ಪ್ರೊಫೈಲ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿ. ಹೆಚ್ಚುವರಿ ಪ್ರವೇಶ ಅನುಮತಿಸಲಾಗಿದೆ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ನಲ್ಲಿ <xliff:g id="COUNT_0">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅನುಮತಿಸಲಾಗಿದೆ"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ಚಿತ್ರ ಬಣ್ಣದ ಮೋಡ್"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ಬಳಸಿ"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ಪ್ರಮಾಣ ತೋರಿಸಿ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ಸಾಂದ್ರತೆ ಝೂಮ್ ಅಳತೆಯ ಪ್ರಮಾಣವನ್ನು ತೋರಿಸಿ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ಸಣ್ಣ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ಸಾಮಾನ್ಯ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ಸ್ವಲ್ಪ ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ದೊಡ್ಡ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ಕಸ್ಟಮ್ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 9ee7547..e6d5227 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"도크에 태블릿을 끼우거나 제거할 때 소리 재생 안함"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생 안함"</string>
     <string name="account_settings" msgid="6403589284618783461">"계정"</string>
-    <string name="category_personal" msgid="1299663247844969448">"개인"</string>
-    <string name="category_work" msgid="8699184680584175622">"직장"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"직장 프로필 계정 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"개인 프로필 계정"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"직장 계정 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"사용 안함"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"항상 사용"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"자동"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"파일 암호화로 변환"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"변환 ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"파일이 이미 암호화됨"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"데이터 파티션을 파일 기반 암호화로 변환하세요.\n !!경고!! 이 기능을 사용하면 모든 데이터가 삭제됩니다.\n 이 기능은 알파 버전으로 제대로 작동하지 않을 수 있습니다.\n 계속하려면 \'삭제 및 변환...\'을 누르세요."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"삭제 및 변환..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"화면이 꺼짐"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"고정 해제 이전에 PIN 요청"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"고정 해제 이전에 비밀번호 요청"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"화면 고정 해제 시 기기 잠금"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"직장 프로필"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"다음에서 이 직장 프로필을 관리합니다."</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>에서 관리"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(베타)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
     <string name="configure_apps" msgid="6685680790825882528">"앱 설정"</string>
     <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
     <string name="app_permissions" msgid="4148222031991883874">"앱 권한"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 추가 액세스 허용됨"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>/<xliff:g id="COUNT_1">%d</xliff:g>개 앱 허용됨"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"사진 색상 모드"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB 사용"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"디스플레이 배율"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"디스플레이 밀도 확대/축소 배율 배율 조정"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"작게"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"보통"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"크게"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"더 크게"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"가장 크게"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"맞춤(<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index e910a35..0e4473f 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Планшетти орнотуп же ажыратып жатканда үн чыкпасын"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Телефонду орнотуп же ажыратып жатканда үн чыкпасын"</string>
     <string name="account_settings" msgid="6403589284618783461">"Эсептер"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Жеке"</string>
-    <string name="category_work" msgid="8699184680584175622">"Жумуш"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Жумуш профилинин каттоо эсептери - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Жеке профилдин каттоо эсептери"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Жумуштагы каттоо эсеби - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Өчүрүлгөн"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Ар дайым күйгүзүлгөн"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматтык"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файл шифрлөөсүнө айландыруу"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Айландыруу …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Файл мурунтан эле шифрленген"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Дайындардын бөлүнүшүн файл негизиндеги шифрлөөгө айландыруу.\n !!Эскертүү!! Бул бардык дайындарыңызды тазалайт.\n Бул функция альфа жана туура иштебеши мүмкүн.\n Улантуу үчүн \'Сүрүп салуу жана айландыруу…\' дегенди басыңыз."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Сүрүп салуу жана айландыруу…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Уктоо"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Экран өчөт"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> колдонулбагандан кийин"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Бошотуудан мурун PIN суралсын"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Бошотуудан мурун сырсөз суралсын"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Бошотулганда түзмөк кулпулансын"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Жумуш профили"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бул жумуш профилин төмөнкү башкарат:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Төмөнкү башкарат <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Колдонмолорду конфигурациялоо"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Колдонмо уруксаттары"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого кошумча уруксат бар"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ичинен <xliff:g id="COUNT_0">%d</xliff:g> колдонмого уруксат бар"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Сүрөт түсү режими"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB колдонуңуз"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дисплей шкаласы"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"дисплей тыгыздыгын чоңойтуп көрсөтүү шкаласынын бөлүштүрүү"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Кичине"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Орточо"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Чоң"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Чоңураак"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Эң чоң"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Ыңгайлаштырылган (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 143697f4..d100c5d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດແທັບເລັດອອກຈາກບ່ອນຕັ້ງສາກ"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດໂທລະສັບອອກຈາກບ່ອນຕັ້ງສາກ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ບັນຊີ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"​ສ່ວນ​ໂຕ"</string>
-    <string name="category_work" msgid="8699184680584175622">"​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ບັນ​ຊີ​ໂປ​ຣ​ໄຟ​ລ໌​ວຽກ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ບັນ​ຊີ​ໂປ​ຣ​ໄຟ​ລ໌​ສ່ວນ​ຕົວ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ບັນ​ຊີ​ບ່ອນເຮັດວຽກ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ປິດໃຊ້ງານແລ້ວ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ເປີດຕະຫຼອດ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ອັດຕະໂນມັດ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ປ່ຽນ​ເປັນ​ການ​ເຂົ້າ​ລະ​ຫັດ​ໄຟ​ລ໌"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"ປ່ຽນ ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ໄຟ​ລ໌​ເຂົ້າ​ລະ​ຫັດ​ຮຽບ​ຮ້ອຍ​ແລ້ວ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ປ່ຽນການແບ່ງ​ສ່ວນ​ຂໍ້​ມູນ​ເປັນ​ການ​ເຂົ້າ​ລະ​ຫັດ​ອີງໃສ່ໄຟ​ລ໌.\n !!ຄຳ​ເຕືອນ!! ອັນ​ນີ້​ຈະ​ລຶບ​ທຸກ​ຂໍ້​ມູ​ນຂອງ​ທ່ານ.\n ຄຸນສົມບັດໃຊ້ງານ​ນີ້​ເປັນ​ອາ​ລ​ຟາ, ແລະ ອາດ​ຈະ​ໃຊ້ງານບໍ່ໄດ້​ຢ່າງ​ຖືກ​ຕ້ອງ.\n ກົດ \'ລຶບ ແລະ ປ່ຽນ...\' ເພື່ອ​ສືບ​ຕໍ່."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ລຶບ ແລະ ປ່ຽນ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ເວລາປິດໜ້າຈໍ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"​ປິດ​ໜ້າ​ຈໍ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"ຫຼັງຈາກ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ທີ່ບໍ່ໄດ້ເຮັດຫຍັງ"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"​ຖາມ​ຫາ PIN ກ່ອນ​ຍົກ​ເລີກ​ການປັກ​ໝຸດ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"​ຖາມ​ຫາ​ລະ​ຫັດ​ຜ່ານ​ກ່ອນ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ລັອກ​ອຸ​ປະ​ກອນ​ເມື່ອ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ໂປຣໄຟລບ່ອນເຮັດວຽກນີ້ຖືກຈັດການໂດຍ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"ຈັດ​ການ​ໂດຍ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ທົດ​ລອງ)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"​ຂັ້ນ​ສູງ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ກຳນົດຄ່າແອັບ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ແອັບທີ່ບໍ່ຮູ້ຈັກ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ເລືອກ​ໂປ​ຣ​ໄຟ​ລ໌"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ການ​ເຂົ້າ​ຫາ​ເພີ່ມ​ເຕີມ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ໃນ <xliff:g id="COUNT_1">%d</xliff:g> ແອັບ​ໄດ້​ຮັບ​ອະ​ນຸ​ຍາດ​ແລ້ວ"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ໂໝດ​ສີ​ຮູບ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ໃຊ້ sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ສະ​ແດງ​ຂະ​ໜາດ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ສະ​ແດງ​ການ​ຂະ​ຫຍາຍ​ຂະ​ໜາດ​ການ​ຊູມ​ຄວາມ​ໜາ​ແໜ້ນ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ນ້ອຍ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ປົກ​ກ​ະ​ຕິ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ໃຫຍ່"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ໃຫຍ່ກວ່າ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ໃຫຍ່​ທີ່​ສຸດ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ປັບ​ແ​ຕ່ງ​ເອງ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index d051bb9..db6fa3f 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nepaleisti garso įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nepaleisti garso įterpiant ar pašalinant telefoną iš dėklo"</string>
     <string name="account_settings" msgid="6403589284618783461">"Paskyros"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Asmeninės"</string>
-    <string name="category_work" msgid="8699184680584175622">"Darbo"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Darbo profilio paskyros – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Asmeninio profilio paskyros"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Darbo paskyra – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Išjungta"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Visada įjungta"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatinė"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertuoti į failų šifruotę"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertuoti..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau konvertuota į failų šifruotę"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Duomenų skaidinys bus konvertuotas į failais pagrįstą šifruotę.\n Įspėjimas! Visi duomenys bus pašalinti.\n Ši funkcija yra alfa versijos ir gali netinkamai veikti.\n Paspauskite „Išvalyti ir konvertuoti...“, kad galėtumėte tęsti."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Išvalyti ir konvertuoti..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranas išjungiamas"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prašyti PIN kodo prieš atsegant"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Prašyti slaptažodžio prieš atsegant"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Užrakinti įrenginį atsegant"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Darbo profilis"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šį darbo profilį tvarko:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Tvarkoma naudojant „<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>“"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentinis)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Išplėstiniai"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Programų konfigūravimas"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nežinoma programa"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profilio pasirinkimas"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Programos leidimai"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Leidžiama papildoma programų prieiga: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Leidžiama programų: <xliff:g id="COUNT_0">%d</xliff:g> iš <xliff:g id="COUNT_1">%d</xliff:g>"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f973f9b..d83e2cb 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -819,8 +819,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Neatskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Neatskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Privāts"</string>
-    <string name="category_work" msgid="8699184680584175622">"Darba"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Darba profila konti — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personīgā profila konti"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Darba konts — <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +841,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Atspējots"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vienmēr ieslēgts"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automātiski"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pārvērst par failu šifrējumu"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Pārvērst…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau šifrēts failu līmenī"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Pārvērtiet datu sadalījumu par failu līmeņa šifrējumu.\n Brīdinājums! Tiks dzēsti visi jūsu dati.\n Šī funkcija ir alfa izstrādes stadijā un var nedarboties, kā paredzēts.\n Lai turpinātu, nospiediet pogu “Dzēst un pārvērst…”"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Dzēst un pārvērst…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrāns tiek izslēgts"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
@@ -2657,7 +2660,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Prasīt PIN kodu pirms atspraušanas"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pirms atspraušanas pieprasīt paroli"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloķēt ierīci, kad tiek veikta atspraušana"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Darba profils"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Šis darba profils tiek pārvaldīts, izmantojot:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pārvalda <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentāla)"</string>
@@ -2745,7 +2747,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Papildu"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lietotņu konfigurēšana"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nezināma lietotne"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profila izvēlēšanās"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Lietotnes atļaujas"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> lietotnēm no <xliff:g id="COUNT_1">%d</xliff:g> ir atļauta papildu piekļuve"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Atļautas <xliff:g id="COUNT_0">%d</xliff:g> lietotnes no <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2905,20 +2906,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Attēla krāsu režīms"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Izmantot sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Attēlojuma mērogs"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"attēlojums blīvums tālummaiņa mērogs mērogošana"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mazs"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Parasts"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Liels"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lielāks"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Vislielākais"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Pielāgots (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 6ae84d8..1b6db99 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не пуштај звук кога се вметнува или отстранува таблетот од полначот"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не пуштај звук кога се вметнува или отстранува телефонот од полначот"</string>
     <string name="account_settings" msgid="6403589284618783461">"Кориснички сметки"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лични"</string>
-    <string name="category_work" msgid="8699184680584175622">"Работа"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Сметки со работен профил - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Сметки со личен профил"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Работна сметка - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Оневозможено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Секогаш вклучено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматски"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертирајте до шифрирање датотеки"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Конвертирај..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Датотеката е веќе шифрирана"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Конвертирајте ја партицијата со податоци до шифрирање на база на датотеки.\n !!Предупредување!! Тоа ќе ги избрише сите податоци.\n Функцијава е алфа и може да не работи правилно.\n Притиснете „Избриши и конвертирај... за да продолжите."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Избриши и конвертирај..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим на штедење"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екранот се исклучува"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"По <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> на неактивност"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Прашај за ПИН пред откачување"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Прашај за лозинка пред откачување"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Заклучи го уредот при откачување"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Работен профил"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овој работен профил е управуван од:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управувано од <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигурирање апликации"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволи за апликацијата"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Дозволен е дополнителен пристап на <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволени се <xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g> апликации"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Режим на боја на слика"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Приказ на скала"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"прикажи го степенувањето на скалата за зумирање на густината"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Мала"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормална"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Голема"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Поголема"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Најголема"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Приспособено (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index d5b0258..8c3e128 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ഡോക്കിൽ ടാബ്‌ലെറ്റ് ചേർക്കുമ്പോഴോ അതിൽ നിന്ന് നീക്കംചെയ്യുമ്പോഴോ ശബ്‌ദം പ്ലേ ചെയ്യരുത്"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ഡോക്കിൽ ഫോൺ ചേർക്കുമ്പോഴോ അതിൽ നിന്ന് നീക്കംചെയ്യുമ്പോഴോ ശബ്‌ദം പ്ലേ ചെയ്യരുത്"</string>
     <string name="account_settings" msgid="6403589284618783461">"അക്കൗണ്ടുകൾ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"വ്യക്തിഗതം"</string>
-    <string name="category_work" msgid="8699184680584175622">"ഔദ്യോഗികം"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ഔദ്യോഗിക പ്രൊഫൈൽ അക്കൗണ്ടുകൾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"വ്യക്തിഗത പ്രൊഫൈൽ അക്കൗണ്ടുകൾ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ഔദ്യോഗിക അക്കൗണ്ട് - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"എല്ലായ്‌പ്പോഴും ഓണാണ്"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ഓട്ടോമാറ്റിക്"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ഫയൽ എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തിപ്പിക്കുക"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"പരിവർത്തിപ്പിക്കുക ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ഇതിനകം തന്നെ ഫയൽ എൻക്രിപ്റ്റ് ചെയ്തു"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ഡാറ്റാ വിഭജനം, ഫയൽ അധിഷ്ഠിത എൻക്രിപ്ഷനിലേക്ക് പരിവർത്തിപ്പിക്കുക.\n !!മുന്നറിയിപ്പ്!! ഇങ്ങനെ ചെയ്താൽ നിങ്ങളുടെ എല്ലാ ഡാറ്റയും മായ്ക്കപ്പെടും.\n ഈ ഫീച്ചറിപ്പോൾ ആൽഫാ ഘട്ടത്തിലാണ്, ശരിയായി പ്രവർത്തിച്ചേക്കില്ല.\n തുടരുന്നതിന് \'വൈപ്പുചെയ്ത് പരിവർത്തിപ്പിക്കുക...\' അമർത്തുക."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"വൈപ്പുചെയ്ത് പരിവർത്തിപ്പിക്കുക..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"സുഷുപ്തിയിലാക്കുക"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"സ്ക്രീൻ ഓഫാക്കുന്നു"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"നിഷ്ക്രിയത്വത്തിന് <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> കഴിഞ്ഞ്"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കൂ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"അൺപിൻ ചെയ്യുന്നതിനുമുമ്പ് പാസ്‌വേഡ് ആവശ്യപ്പെടുക"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"അൺപിൻ ചെയ്യുമ്പോൾ ഉപകരണം ലോക്കുചെയ്യുക"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ഈ വർക്ക് പ്രൊഫൈൽ നിയന്ത്രിക്കുന്നത്:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> നിയന്ത്രിക്കുന്നു"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(പരീക്ഷണാത്മകം)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"വിപുലമായത്"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ആപ് കോണ്‍ഫിഗര്‍ചെയ്യൂ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"അജ്ഞാത അപ്ലിക്കേഷൻ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ആപ്പ് അനുമതികൾ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾക്ക് കൂടുതൽ ആക്‌സസ്സ് അനുവദിച്ചിരിക്കുന്നു"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> അപ്ലിക്കേഷനുകൾ അനുവദനീയം"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ചിത്ര വർണ്ണ മോഡ്"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ഉപയോഗിക്കുക"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ഡിസ്പ്ലേ സ്കെയിൽ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ഡിസ്‌പ്ലേ ഡെൻസിറ്റി സൂം സ്കെയിൽ സ്കെയിലിംഗ്"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ചെറുത്"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"സാധാരണം"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"വലുത്"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"വലുത്"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ഏറ്റവും വലുത്"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ഇഷ്ടാനുസൃതം ( <xliff:g id="DENSITYDPI">%d</xliff:g> )"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 1177154..f3ec5e4 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -801,8 +801,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Таблетыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Утсыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
     <string name="account_settings" msgid="6403589284618783461">"Акаунт"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Хувийн"</string>
-    <string name="category_work" msgid="8699184680584175622">"Ажил"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ажлын профайлын бүртгэл - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Хувийн профайлын бүртгэл"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Ажлын бүртгэл - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -825,6 +823,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Идэвхгүй"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Байнга асаалттай"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматаар"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Файлын шифрлэлт болгон хөрвүүлэх"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Хөрвүүлэх ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Аль хэдийн файл шифрлэгдсэн"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Өгөгдлийн хуваалтыг файлд суурилсан шифрлэлтэд хөрвүүлэх .\n !!Анхааруулга!! Энэ нь таны бүх өгөгдлийг устгах болно.\n Энэ онцлог нь альфа бөгөөд зөв ажиллахгүй байж болзошгүй.\n Үргэлжлүүлэхийн тулд \"Арчаад, хөрвүүлэх...\"-г дарна уу."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Арчаад, хөрвүүлэх..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Идэвхгүй"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
@@ -2628,7 +2631,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тогтоосныг суллахаас өмнө PIN асуух"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тогтоосныг суллахаас өмнө нууц үг асуух"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Unpinning хийх үед төхөөрөмжийг түгжинэ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Ажлын профайл"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Энэ ажлын профайлыг удирдагч нь:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>-аар удирдана"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Туршилтын)"</string>
@@ -2713,7 +2715,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Боловсронгуй"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Апп тохируулах"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Үл мэдэгдэх апп"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Профайлаа сонгоно уу"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Апп зөвшөөрөл"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g>-аас<xliff:g id="COUNT_1">%d</xliff:g> апп-уудад нэмэлтээр нэвтрэхийг зөвшөөрсөн"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g>-аас <xliff:g id="COUNT_1">%d</xliff:g> апп зөвшөөрөгдсөн"</string>
@@ -2870,20 +2871,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"\"Зургийн өнгө\" горим"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB-г ашиглах"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Дэлгэцийн хэмжээ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"томруулалтын хэмжээг тооцоолох дэлгэцийн нягтрал"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Жижиг"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Хэвийн"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Том"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Илүү том"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Хамгийн том"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Тохируулсан (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 6073bd2..bd55ad0 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डॉकवरून टॅबलेट घालताना किंवा त्यातून काढताना ध्वनी प्ले करू नका"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डॉकवरून फोन घालताना किंवा काढताना ध्वनी प्ले करू नका"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाती"</string>
-    <string name="category_personal" msgid="1299663247844969448">"वैयक्तिक"</string>
-    <string name="category_work" msgid="8699184680584175622">"कार्य"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफाईल खाती - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"वैयक्तिक प्रोफाईल खाती"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्य खाते - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"अक्षम केले"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"नेहमी चालू"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वयंचलित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फाईल कूटबद्धीकरणावर रूपांतरित करा"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"रूपांतरित करा..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"फाईल आधीपासून कूटबद्ध केली"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"फाईल आधारित कूटबद्धीकरणावर डेटा विभाजक रूपांतरित करा.\n !!चेतावणी!! हे आपल्‍या सर्व डेटास मिटवेल.\n हे वैशिष्ट्य अल्‍फा आहे आणि कदाचित योग्यरित्या कार्य करू शकत नाही.\n सुरु ठेवण्‍यासाठी \'पुसा आणि रूपांतरित करा...\' दाबा."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"पुसा आणि रुपांतरित करा..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रीन बंद होते"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियतेच्या <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> नंतर"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करण्‍यापूर्वी संकेतशब्दासाठी विचारा"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन करताना डिव्हाइस लॉक करा"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाईल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"हे कार्य प्रोफाईल याद्वारे व्यवस्थापित केले आहे:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारे व्यवस्थापित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"प्रगत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अ‍ॅप्स कॉन्‍फिगर करा"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अॅप"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाईल निवडा"</string>
     <string name="app_permissions" msgid="4148222031991883874">"अॅप परवानग्या"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अतिरिक्त प्रवेशाची अनुमती आहे"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> पैकी <xliff:g id="COUNT_0">%d</xliff:g> अॅप्सना अनुमती आहे"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रंग मोड"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB वापरा"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"मापन प्रदर्शित करा"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"प्रदर्शन घनता झूम मापन करीत आहे"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"लहान"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"सामान्य"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"मोठा"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"मोठा"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"सर्वात मोठे"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"सानुकूल करा (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index ce778c9..68509f2 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan tablet dari dok"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan telefon dari dok"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akaun"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Peribadi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Tempat Kerja"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akaun profil kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akaun profil peribadi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akaun kerja - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dilumpuhkan"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sentiasa hidup"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Tukar kepada penyulitan fail"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Tukar ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah disulitkan fail"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Tukar pembahagian data kepada penyulitan berasaskan fail.\n !!Amaran!! Ini akan menghapuskan semua data anda.\n Ciri ini adalah alfa dan mungkin tidak berfungsi dengan betul.\n Tekan \'Lap dan tukar...\' untuk meneruskan."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Lap dan tukar..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrin dimatikan"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Minta PIN sebelum nyahsemat"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Minta kata laluan sebelum menyahsemat"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kunci peranti semasa menyahsemat"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil kerja"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Profil kerja ini diurus oleh:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Diurus oleh <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Percubaan)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Terperinci"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurasikan apl"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Apl tidak diketahui"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pilih Profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Kebenaran apl"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang diberikan akses tambahan"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> daripada <xliff:g id="COUNT_1">%d</xliff:g> apl yang dibenarkan"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index d0e4588..30235f0 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"တက်ဘလက်အားအထိုင်ထဲသို့ထည့်စဥ် သို့မဟုတ်ဖြုတ်စဥ် အသံမမြည်စေရန်"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ဖုန်းအားအထိုင်ထဲသို့ထည့်စဉ် သို့မဟုတ်ဖြုတ်စဉ် အသံမမြည်စေရန်"</string>
     <string name="account_settings" msgid="6403589284618783461">"အကောင့်များ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ကိုယ်ရေး"</string>
-    <string name="category_work" msgid="8699184680584175622">"အလုပ်အကိုင်"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"အလုပ်အချက်အလက် အကောင့်များကို - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ကိုယ်ရေးကိုယ်တာ အချက်အလက် အကောင့်များ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"အလုပ်အကောင့်ကို - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ပိတ်ထား"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"အမြဲတမ်း ဖွင့်ထားရန်"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"အလိုအလျောက်"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ဖိုင်လုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"ပြောင်းပါ ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ဖိုင်ကို လုံခြုံအောင်ပြုလုပ်ပြီးပါပြီ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ဒေတာအပိုင်းကို ဖိုအခြေပြု လုံခြုံအောင်ပြုလုပ်ခြင်းသို့ ပြောင်းပါ \n ။။သတိပေးချက်။။ ၎င်းသည် သင့်ဒေတာများအားလုံးကို ဖျက်လိုက်ပါမည်။ \n ဤလုပ်ဆောင်ချက်သည် အစမ်းသာဖြစ်သည်၊ မှန်ကန်စွာ အလုပ်လုပ်လိမ့်မည်မဟုတ်ပါ။ \n ရှေ့ဆက်ရန် \'ရှင်းလင်းပြီး ပြောင်းမည်...\' ကိုနှိပ်ပါ။"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ရှင်းလင်းပြီး ပြောင်းမည်..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"နားခြင်း"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"မျက်နှာပြင်များကို ပိတ်ထား"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>နောက်ပိုင်း လှုပ်ရှားမှုမရှိခြင်း"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ပင်မဖြုတ်မီမှာ PIN ကို မေးရန်"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"သော့ခတ်ကိရိယာ ပင်ထိုးမှုဖြုတ်နေ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"အလုပ် ပရိုဖိုင်"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ဤအလုပ်ပရိုဖိုင်အား စီမံခန့်ခွဲသည်မှာ-"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> မှ စီမံသည်။"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"အဆင့်မြင့်"</string>
     <string name="configure_apps" msgid="6685680790825882528">"apps များ ပုံစံပြင်သတ်မှတ်ပါ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"အမည်မသိ အပလီကေးရှင်း"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ပရိုဖိုင်ရွေးရန်"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App ခွင့်ပြုချက်များ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များနောက်ထပ် အသုံးပြုမှုများ ခွင့်ပြုထား"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> ၏ <xliff:g id="COUNT_1">%d</xliff:g> အပ်ဖ်များ ခွင့်ပြုထား"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 4bc8249..510931d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ikke spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ikke spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
     <string name="account_settings" msgid="6403589284618783461">"Kontoer"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
-    <string name="category_work" msgid="8699184680584175622">"Jobb"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Joobprofil-kontoer – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personlig profil-kontoer"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Jobbkonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Slått av"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltid på"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisk"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til kryptert fil"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertér …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede kryptert og lagret som fil"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konvertér datapartisjonen til filbasert kryptering.\n !!Advarsel!! Dette sletter alle dataene dine.\n Dette er en alfafunksjon og kommer kanskje ikke til å fungere skikkelig.\n Trykk på «Slett og konvertér …» for å fortsette."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Slett og konvertér …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skjermen slås av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kode for å løsne apper"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Krev passord for å løsne apper"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten under løsning av apper"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Jobbprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbeidsprofilen administreres av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrert av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
@@ -2661,9 +2663,9 @@
     <string name="encrypt_require_pin" msgid="2063945047845243752">"Krev PIN-kode for å starte enheten"</string>
     <string name="encrypt_require_pattern" msgid="6898479411004015810">"Krev mønster for å starte enheten"</string>
     <string name="encrypt_require_password" msgid="8770628366276570518">"Krev passord for å starte enheten"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei takk"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei takk"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei takk"</string>
+    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei, takk"</string>
+    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei, takk"</string>
+    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei, takk"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vil du kreve PIN-kode?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vil du kreve mønster?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vil du kreve passord?"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avansert"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurer apper"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ukjent app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Velg profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Apptillatelser"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper har ekstra tilgang"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> apper er tillatt"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Fargemodus for bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Bruk sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skjermskala"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skjerm tetthet zoom skala skalering"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Liten"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Vanlig"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stor"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Større"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Størst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Egendefinert (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 72a7d61..15794dc 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"डकमा ट्याब्लेट राख्दा वा झिक्दा आवाज नबजाउनुहोस्"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"डकमाफोन राख्दा वा झिक्दा आवाज नबजाउनुहोस्"</string>
     <string name="account_settings" msgid="6403589284618783461">"खाताहरू"</string>
-    <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string>
-    <string name="category_work" msgid="8699184680584175622">"काम"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"कार्य प्रोफाइल खाताहरू - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"व्यक्तिगत प्रोफाइल खाताहरू"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"कार्य खाता - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"असक्षम गरियो"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"सधैं खुल्‍ला"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"स्वचालित"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"फाइल इन्क्रिप्सनमा रूपान्तरण गर्नुहोस्"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"रूपान्तरण गर्दै ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"पहिल्यै फाइल इन्क्रिप्ट छ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"डेटा विभाजनलाई फाइलमा आधारित इन्क्रिप्सनमा रूपान्तर गर्नुहोस्।\n !!चेतावनी!! यसले तपाईँको सबै डेटा मेट्नेछ।\n यो सुविधा अल्फा चरणमा छ, र ठीक सँग काम नगर्न सक्छ।\n जारी गर्न \'हटाएर रूपान्तरण गर्नुहोस्...\' मा थिच्नुहोस्।"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"हटाएर रूपान्तरण गर्नुहोस्..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"निष्क्रिय"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"स्क्रिन बन्द हुन्छ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रियता पछि"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"पिन निकाल्नुअघि पासवर्ड सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"अनपिन गर्दा उपकरण लक गर्नुहोस्"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"कार्य प्रोफाइल"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यो कार्य प्रोफाइल निम्नद्वारा व्यवस्थित गरिन्छ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा व्यवस्थापन गरिएको"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रयोगात्मक)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"उन्नत"</string>
     <string name="configure_apps" msgid="6685680790825882528">"अनुप्रयोगहरू कन्फिगर गर्नुहोस्"</string>
     <string name="unknown_app" msgid="5275921288718717656">"अज्ञात अनुप्रयोग"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"प्रोफाइल रोज्नुहोस्"</string>
     <string name="app_permissions" msgid="4148222031991883874">"अनुप्रयोग अनुमतिहरू"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई थप पहुँच अनुमति छ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> को <xliff:g id="COUNT_0">%d</xliff:g> अनुप्रयोगहरूलाई अनुमति छ"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"चित्र रङ्ग मोड"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB प्रयोग गर्नुहोस्"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"प्रदर्शनको अनुपात"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"घनत्व जुम अनुपात मापन प्रदर्शन गर्नुहोस्"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"सानो"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"सामान्य"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ठूलो"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"थप ठूलो"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"सबैभन्दा ठूलो"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"अनुकूलन (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e170bc6..336bc69 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Geen geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Geen geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
     <string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Persoonlijk"</string>
-    <string name="category_work" msgid="8699184680584175622">"Werk"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Werkprofielaccounts - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Persoonlijke profielaccounts"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Werkaccount - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Uitgeschakeld"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Altijd aan"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatisch"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteren naar versleuteling op basis van bestanden"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converteren..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Al versleuteld op basis van bestanden"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Gegevenspartitie converteren naar versleuteling op basis van bestanden.\n !!Waarschuwing!! Al je gegevens worden gewist.\n Deze functie bevindt zich in de alfafase en werkt mogelijk niet correct.\n Druk op \'Wissen en converteren\' om door te gaan."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wissen en converteren..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Scherm wordt uitgeschakeld"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Vraag pin voor losmaken"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Vraag wachtwoord voor losmaken"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Apparaat vergrendelen wanneer items worden losgemaakt"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Werkprofiel"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dit werkprofiel wordt beheerd door:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Beheerd door <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimenteel)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Geavanceerd"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Apps configureren"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Onbekende app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profiel kiezen"</string>
     <string name="app_permissions" msgid="4148222031991883874">"App-machtigingen"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Extra toegang verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Verleend aan <xliff:g id="COUNT_0">%d</xliff:g> van <xliff:g id="COUNT_1">%d</xliff:g> apps"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml
index 5e63eb1..8f4fff8d 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ਡੌਕ ਤੋਂ ਟੈਬਲੇਟ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ਡੌਕ ਤੋਂ ਫੋਨ ਪਾਉਂਦੇ ਹੋਏ ਜਾਂ ਹਟਾਉਂਦੇ ਹੋਏ ਅਵਾਜ਼ ਪਲੇ ਨਾ ਕਰੋ"</string>
     <string name="account_settings" msgid="6403589284618783461">"ਖਾਤੇ"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ਨਿੱਜੀ"</string>
-    <string name="category_work" msgid="8699184680584175622">"ਦਫ਼ਤਰ"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ਨਿੱਜੀ ਪ੍ਰੋਫਾਈਲ ਖਾਤੇ"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"ਕੰਮ ਖਾਤਾ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ਹਮੇਸ਼ਾ ਚਾਲੂ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ਆਟੋਮੈਟਿਕ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ਫ਼ਾਈਲ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"ਤਬਦੀਲ ਕਰੋ ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ਫ਼ਾਈਲ ਪਹਿਲਾਂ ਤੋਂ ਇਨਕ੍ਰਿਪਟਡ ਹੈ"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ਡੈਟਾ ਪਾਰਟੀਸ਼ਨ ਨੂੰ ਫ਼ਾਈਲ ਆਧਾਰਿਤ ਇਨਕ੍ਰਿਪਸ਼ਨ ਵਿੱਚ ਤਬਦੀਲ ਕਰੋ\n !!ਚੇਤਾਵਨੀ!! ਇਹ ਤੁਹਾਡੇ ਸਾਰੇ ਡੈਟੇ ਨੂੰ ਸਾਫ਼ ਕਰ ਦੇਵੇਗਾ\n ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਅਲਫਾ ਹੈ, ਅਤੇ ਸ਼ਾਇਦ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰੇ।\n ਜਾਰੀ ਰੱਖਣ ਲਈ \'ਮਿਟਾਓ ਅਤੇ ਤਬਦੀਲ ਕਰੋ...\' ਨੂੰ ਦਬਾਓ।"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ਮਿਟਾਓ ਅਤੇ ਤਬਦੀਲ ਕਰੋ ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"ਸਲੀਪ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"ਸਕ੍ਰੀਨ ਬੰਦ ਹੈ"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ਦੀ ਕਿਰਿਆਹੀਣਤਾ ਤੋਂ ਬਾਅਦ"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ PIN ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ਅਨਪਿਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਸਵਰਡ ਮੰਗੋ"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ਅਨਪਿੰਨ ਕਰਨ ਵੇਲੇ ਡਿਵਾਈਸ ਲੌਕ ਕਰੋ"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ਇਹ ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਇਸ ਵੱਲੋਂ ਵਿਵਸਥਿਤ ਕੀਤੀ ਗਈ ਹੈ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> ਦੁਆਰਾ ਪ੍ਰਬੰਧਿਤ"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ਪ੍ਰਯੋਗਾਤਮਿਕ)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"ਉੱਨਤ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ਐਪਸ ਕੌਂਫਿਗਰ ਕਰੋ"</string>
     <string name="unknown_app" msgid="5275921288718717656">"ਅਗਿਆਤ ਐਪ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ਪ੍ਰੋਫਾਈਲ ਚੁਣੋ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ਐਪ ਅਨੁਮਤੀਆਂ"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਨੂੰ ਵਾਧੂ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g> ਦੇ <xliff:g id="COUNT_0">%d</xliff:g> ਐਪਸ ਦੀ ਆਗਿਆ ਦਿੱਤੀ"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"ਤਸਵੀਰ ਰੰਗ ਮੋਡ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ਵਰਤੋਂ ਕਰੋ"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ਡਿਸਪਲੇਅ ਸਕੇਲ"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ਡਿਸਪਲੇਅ ਡੈਨਸਿਟੀ ਜ਼ੂਮ ਸਕੇਲ ਸਕੇਲਿੰਗ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"ਛੋਟਾ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ਸਧਾਰਨ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ਵੱਡਾ"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ਕਾਫ਼ੀ ਵੱਡਾ"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ਸਭ ਤੋਂ ਵੱਡਾ"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"ਕਸਟਮ (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 22fd1d5..3ae8de8 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konta"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobiste"</string>
-    <string name="category_work" msgid="8699184680584175622">"Praca"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Konta profili do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Konta profili osobistych"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Konto do pracy – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Wyłączone"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Zawsze włączone"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatycznie"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Przekształć na szyfrowanie plików"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Przekształć..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Pliki są już zaszyfrowane"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Przekształć zwykłą partycję danych w system szyfrowania plików.\n !!Ostrzeżenie!! Spowoduje to wykasowanie wszystkich Twoich danych.\n Ta funkcja jest w wersji alfa i może działać nieprawidłowo.\n Naciśnij „Wyczyść i przekształć...”, by kontynuować."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Wyczyść i przekształć..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Wyłączenie ekranu"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Podaj PIN, aby odpiąć"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Aby odpiąć, poproś o hasło"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Zablokuj urządzenie przy odpinaniu"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil do pracy"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tym profilem do pracy zarządza:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Zarządzane przez: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Funkcja eksperymentalna)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Zaawansowane"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Skonfiguruj aplikacje"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Nieznana aplikacja"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Wybierz profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Uprawnienia aplikacji"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Dodatkowy dostęp dozwolony dla <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dozwolone: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikacji"</string>
@@ -2928,20 +2929,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Tryb kolorów obrazu"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Użyj sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala wyświetlania"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"wyświetlacz gęstość powiększenie skala skalowanie"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mała"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normalna"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Duża"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Większa"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Największa"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Niestandardowa (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 5a10362..503ff38 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativada"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converter partição de dados para criptografia baseada em arquivos. \n !!Atenção!! Isso limpará todos os seus dados.\n Esse recurso é alfa e pode não funcionar corretamente.\n Pressione \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao desafixar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de exibição"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densidade de exibição zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Muito grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e21d726..d8b0061 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativado"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativado"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para a encriptação de ficheiros"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Os ficheiros já estão encriptados"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converter a partição de dados para a encriptação baseada em ficheiros.\n !!Aviso!! Esta ação eliminará todos os seus dados.\n Esta funcionalidade está na fase alfa e pode não funcionar corretamente.\n Prima \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"O ecrã desliga-se"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de soltar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir palavra-passe antes de soltar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao soltar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Este perfil de trabalho é gerido por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerido por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicações"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicação desconhecida"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões da aplicação"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas com acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> aplicações autorizadas"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utilizar sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de apresentação"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"apresentação densidade zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Maior"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"A maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 5a10362..503ff38 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Contas do perfil de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Contas do perfil pessoal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Conta de trabalho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Desativada"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Sempre ativada"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automático"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Converter..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Converter partição de dados para criptografia baseada em arquivos. \n !!Atenção!! Isso limpará todos os seus dados.\n Esse recurso é alfa e pode não funcionar corretamente.\n Pressione \"Limpar e converter...\" para continuar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Limpar e converter..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"A tela é desativada"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Bloquear dispositivo ao desafixar"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Perfil de trabalho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"O perfil de trabalho é gerenciado por:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gerenciado por <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avançadas"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar apps"</string>
     <string name="unknown_app" msgid="5275921288718717656">"App desconhecido"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Escolher perfil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permissões do app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps receberam acesso adicional"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> de <xliff:g id="COUNT_1">%d</xliff:g> apps permitidos"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modo de cor da imagem"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Usar sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Escala de exibição"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"densidade de exibição zoom escala dimensionamento"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Pequena"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Grande"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Muito grande"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Maior"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizada (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5f38a53..cde044e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="yes" msgid="4676390750360727396">"Da"</string>
     <string name="no" msgid="6731231425810196216">"Nu"</string>
-    <string name="create" msgid="3578857613172647409">"Creaţi"</string>
+    <string name="create" msgid="3578857613172647409">"Creați"</string>
     <string name="allow" msgid="3349662621170855910">"Permiteți"</string>
     <string name="deny" msgid="6947806159746484865">"Refuzați"</string>
     <string name="dlg_close" msgid="7471087791340790015">"Închideți"</string>
@@ -236,7 +236,7 @@
     <string name="skip_label" msgid="47510779345218297">"Omiteți"</string>
     <string name="next_label" msgid="4693520878012668114">"Înainte"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Limba"</string>
-    <string name="activity_picker_label" msgid="6295660302548177109">"Alegeţi activitatea"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"Alegeți activitatea"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Informații despre dispozitiv"</string>
     <string name="display_label" msgid="8074070940506840792">"Ecran"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Informații tabletă"</string>
@@ -312,7 +312,7 @@
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Parole"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
@@ -378,7 +378,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric ori o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptați tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptați telefonul"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria și încercaţi din nou."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcați bateria și încercaţi din nou."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Conectați încărcătorul și încercați din nou."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Nu există un cod PIN sau o parolă pentru blocarea ecranului"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Trebuie să setați un cod PIN sau o parolă pentru blocarea ecranului înainte de a începe criptarea."</string>
@@ -395,13 +395,13 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Avertisment: datele de pe dispozitiv vor fi șterse după încă <xliff:g id="COUNT">^1</xliff:g> încercări nereușite de deblocare!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereușită"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi tableta după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuați o resetare la valorile din fabrică. Când configuraţi telefonul după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe tableta dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea tabletei, trebuie să efectuați o resetare la valorile din fabrică. Când configurați tableta după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Criptarea a fost întreruptă și nu se poate finaliza. Prin urmare, datele de pe telefonul dvs. nu mai sunt accesibile. \n\nPentru a relua utilizarea telefonului, trebuie să efectuați o resetare la valorile din fabrică. Când configurați telefonul după resetare, veți putea restabili toate datele pentru care aţi creat copii de rezervă în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decriptarea nu a reușit"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea tabletei, trebuie să reveniți la setările din fabrică. Când vă configurați tableta după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Parola pe care ați introdus-o este corectă, dar, din păcate, datele sunt deteriorate. \n\nPentru a relua utilizarea telefonului, trebuie să reveniți la setările din fabrică. Când vă configurați telefonul după resetare, veți putea să restabiliți toate datele care au backup în Contul Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Comutaţi metoda de introducere"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeţi blocare ecran"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Alegeți blocare ecran"</string>
     <string name="setup_lock_settings_picker_title" msgid="1584792702475081908">"Alegeți blocarea ecranului"</string>
     <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Alegeți metoda de rezervă de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Blocarea ecranului"</string>
@@ -701,7 +701,7 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salvați"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Nu s-a putut salva reţeaua"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Anulați"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignoraţi oricum"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignorați oricum"</string>
     <string name="wifi_dont_skip" msgid="3615535136327231588">"Înapoi"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="6761689889733331124">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, tableta dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
     <string name="wifi_skipped_message" product="device" msgid="1385490367826852775">"AVERTISMENT: Dacă ignorați conexiunea Wi‑Fi, dispozitivul dvs. va utiliza numai datele mobile pentru descărcările sau actualizările inițiale. Pentru a evita eventualele costuri pentru date, conectați-vă la Wi-Fi."</string>
@@ -819,8 +819,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Nu doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Nu redaţi sunetul la introducerea și la scoaterea telefonului din dispozitivul de andocare"</string>
     <string name="account_settings" msgid="6403589284618783461">"Conturi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Serviciu"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Conturi cu profil de serviciu – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Conturi cu profil personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Cont de serviciu – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +841,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Dezactivată"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Activată permanent"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automat"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faceți conversia la criptarea bazată pe sistemul de fișiere"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Convertiți..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Criptarea bazată pe sistemul de fișiere este finalizată"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Faceți conversia partiției de date la criptarea bazată pe sistemul de fișiere. \n !!Avertisment!! Astfel, toate datele dvs. vor fi șterse.\n Aceasta este o funcție în versiune alpha și este posibil să nu funcționeze corect.\n Apăsați „Ștergeți și convertiți...” pentru a continua."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Ștergeți și convertiți..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ecranul se dezactivează"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
@@ -985,7 +988,7 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"În curs de demontare"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Spațiu de stocare aproape ocupat"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercați să eliberați spațiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conținut media)."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcții de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercați să eliberați spațiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicații sau conținut media)."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Redenumiți"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Montați"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"Scoateți"</string>
@@ -1208,15 +1211,15 @@
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Aplicațiile estimează mai rapid locația cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Sateliți GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicațiilor să utilizeze GPS de pe tabletă pentru a indica locaţia dvs."</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicațiilor să utilizeze GPS de pe telefon pentru a indica locaţia dvs."</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicațiilor să utilizeze GPS de pe tabletă pentru a indica locația dvs."</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicațiilor să utilizeze GPS de pe telefon pentru a indica locația dvs."</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizați GPS asistat"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizați serverul pentru a asista funcția GPS (debifați pentru a reduce utilizarea rețelei)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizați serverul pentru a asista funcția GPS (debifați pentru a îmbunătăți performanța GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Locație și căutare Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permiteți Google să utilizeze locația dvs. pt. îmbunătățirea rezultatelor căutării și a serviciilor"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acces la locaţia dvs."</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informaţiile dvs. de localizare"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acces la locația dvs."</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Acordaţi aplicațiilor care v-au solicitat, permisiunea să utilizeze informațiile dvs. de localizare"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Surse de locații"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Despre tabletă"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Despre telefon"</string>
@@ -1287,7 +1290,7 @@
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestionați aplicații"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestionați și eliminaţi aplicațiile instalate"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Aplicații"</string>
-    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionați aplicații, creaţi comenzi rapide pentru lansare rapidă"</string>
+    <string name="applications_settings_summary" msgid="6683465446264515367">"Gestionați aplicații, creați comenzi rapide pentru lansare rapidă"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Setări aplicații"</string>
     <string name="install_applications" msgid="4872012136210802181">"Surse necunoscute"</string>
     <string name="install_applications_title" msgid="4987712352256508946">"Permite aplic. din orice surse"</string>
@@ -1296,7 +1299,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tableta și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteți de acord că sunteți singura persoană responsabilă pentru deteriorarea tabletei sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Telefonul și datele dvs. personale sunt mai vulnerabile la un atac din partea aplicațiilor ce provin din surse necunoscute. Sunteți de acord că sunteți singura persoană responsabilă pentru deteriorarea telefonului sau pierderea datelor ce pot avea loc ca urmare a utilizării acestor aplicații."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Setări avansate"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opţiuni pentru setări"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"Activați mai multe opțiuni pentru setări"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informații despre aplicație"</string>
     <string name="storage_label" msgid="8700867073480107253">"Stocare"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Deschide în mod prestabilit"</string>
@@ -1340,7 +1343,7 @@
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetaţi aplicațiile"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestionați spațiul"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrați"</string>
-    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
+    <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeți opţiunile de filtrare"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toate"</string>
     <string name="filter_apps_disabled" msgid="5364447573326472890">"Dezactivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descărcate"</string>
@@ -1389,14 +1392,14 @@
     <string name="insufficient_storage" msgid="481763122991093080">"Nu există suficient spațiu de stocare."</string>
     <string name="does_not_exist" msgid="1501243985586067053">"Aplicaţia nu există."</string>
     <string name="app_forward_locked" msgid="6331564656683790866">"Aplicaţia este protejată la copiere."</string>
-    <string name="invalid_location" msgid="4354595459063675191">"Locaţia de instalare nu este validă."</string>
+    <string name="invalid_location" msgid="4354595459063675191">"Locația de instalare nu este validă."</string>
     <string name="system_package" msgid="1352722848400644991">"Actualizările de sistem nu pot fi instalate pe suportul extern."</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Opriți forţat?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Dacă forţaţi oprirea unei aplicații, aceasta se poate comporta necorespunzător."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Aplicaţia nu a putut fi mutată. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Locație preferată de instalare"</string>
-    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicații"</string>
+    <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locația preferată de instalare pentru noile aplicații"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Dezactivați aplicația"</string>
     <string name="app_disable_dlg_text" msgid="7824930380425568584">"Dacă dezactivați această aplicație, este posibil ca alte aplicații să nu mai funcționeze corespunzător."</string>
@@ -1451,7 +1454,7 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"Serviciul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Furnizorul <xliff:g id="COMP_NAME">%1$s</xliff:g> se află în utilizare."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriți serviciul de sistem?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veți închide și redeschide."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcții ale tabletei să nu mai funcţioneze corect decât după ce o veți închide și redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriți acest serviciu, este posibil ca unele funcții ale telefonului să nu mai funcționeze corect decât după ce îl veți închide și redeschide."</string>
     <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și introducere de text"</string>
@@ -1477,8 +1480,8 @@
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controler de joc"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizaţi mecanismul de vibrare"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Redirecţionaţi mecanismul de vibrare pentru controlerul de joc când este conectat."</string>
-    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Alegeţi aspectul tastaturii"</string>
-    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configuraţi aspectele tastaturii"</string>
+    <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Alegeți aspectul tastaturii"</string>
+    <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Configurați aspectele tastaturii"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Pentru comutare, apăsați pe Control-Space"</string>
     <!-- no translation found for keyboard_layout_default_label (2952672513543482165) -->
     <skip />
@@ -1499,7 +1502,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificați cuvântul"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modificați"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ștergeți"</string>
-    <string name="user_dict_settings_empty_text" msgid="996593969349827966">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugaţi (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="996593969349827966">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugați (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pentru toate limbile"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mai multe limbi..."</string>
     <string name="testing" msgid="6584352735303604146">"Testare"</string>
@@ -1523,7 +1526,7 @@
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Tastatură fizică"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setări pentru tastatura fizică"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opțiuni dezvoltator"</string>
-    <string name="development_settings_summary" msgid="1815795401632854041">"Setați opţiuni pentru dezvoltarea aplicației"</string>
+    <string name="development_settings_summary" msgid="1815795401632854041">"Setați opțiuni pentru dezvoltarea aplicației"</string>
     <string name="development_settings_not_available" msgid="4308569041701535607">"Opțiunile de dezvoltator nu sunt disponibile pentru acest utilizator"</string>
     <string name="vpn_settings_not_available" msgid="956841430176985598">"Setările VPN nu sunt disponibile pentru acest utilizator"</string>
     <string name="tethering_settings_not_available" msgid="6765770438438291012">"Setările pentru tethering nu sunt disponibile pentru acest utilizator"</string>
@@ -1586,8 +1589,8 @@
     <string name="enable_terminal_summary" msgid="67667852659359206">"Activați aplicația terminal care oferă acces la shell local"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"Alegeți obiectul gadget"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Alegeți obiectul widget"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creaţi widgetul și permiteţi accesul?"</string>
-    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creaţi widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afișează."</string>
+    <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Creați widgetul și permiteţi accesul?"</string>
+    <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"După ce creați widgetul, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> poate accesa toate datele pe care acesta le afișează."</string>
     <string name="allow_bind_app_widget_activity_always_allow_bind" msgid="7037503685859688034">"Permiteţi întotdeauna ca <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> să creeze widgeturi și să acceseze datele acestora"</string>
     <string name="battery_history_days" msgid="7110262897769622564">"<xliff:g id="DAYS">%1$d</xliff:g> z <xliff:g id="HOURS">%2$d</xliff:g> h <xliff:g id="MINUTES">%3$d</xliff:g> m <xliff:g id="SECONDS">%4$d</xliff:g> s"</string>
     <string name="battery_history_hours" msgid="7525170329826274999">"<xliff:g id="HOURS">%1$d</xliff:g> h <xliff:g id="MINUTES">%2$d</xliff:g> m <xliff:g id="SECONDS">%3$d</xliff:g> s"</string>
@@ -1609,11 +1612,11 @@
     <string name="accessibility_display_title" msgid="7610175687949675162">"Afișaj"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesturi pentru mărire"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcţii, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepția tastaturii și a barei de navigare."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="1178289000423776584">"După activarea acestei funcții, puteţi mări și micşora atingând de trei ori ecranul.\n\nÎn timp ce măriți, puteţi:\n"<ul><li>"să deplasați: deplasați două sau mai multe degete pe ecran;"</li>\n<li>"să ajustați nivelul de zoom: ciupiți cu două sau mai multe degete ori îndepărtați-le."</li></ul>\n\n"De asemenea, puteţi să măriți temporar ce se află sub degetul dvs. atingând ecranul de trei ori și menținând degetul pe ecran. În imaginea mărită, puteţi să glisaţi degetul pentru a explora diferite părți ale ecranului. Ridicaţi degetul pentru a reveni la starea anterioară.\n\nNotă: atingerea triplă pentru mărire funcţionează peste tot, cu excepția tastaturii și a barei de navigare."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă de accesibilitate"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Activat"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Dezactivată"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcţii, puteţi să activați rapid funcţiile de accesibilitate în doi pași:\n\nPasul 1: apăsați și menţineţi apăsat butonul de pornire până când auziți un sunet sau simțiți o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete și menţineţi degetele pe ecran până când auziți o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"După activarea acestei funcții, puteţi să activați rapid funcțiile de accesibilitate în doi pași:\n\nPasul 1: apăsați și menţineţi apăsat butonul de pornire până când auziți un sunet sau simțiți o vibraţie.\n\nPasul 2: atingeţi ecranul cu două degete și menţineţi degetele pe ecran până când auziți o confirmare audio.\n\nDacă gadgetul are mai mulţi utilizatori, folosirea acestei comenzi rapide pe ecranul de blocare activează temporar accesibilitatea până când gadgetul este deblocat."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Text mare"</string>
     <string name="accessibility_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Text cu contrast ridicat"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
@@ -1821,7 +1824,7 @@
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterie utilizată de Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"Dezactivați rețeaua Wi-Fi atunci când nu o utilizați sau când nu este disponibilă"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterie utilizată de Bluetooth"</string>
-    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Dezactivați funcţia Bluetooth atunci când nu o utilizaţi"</string>
+    <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Dezactivați funcția Bluetooth atunci când nu o utilizaţi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Încercați să vă conectaţi la un alt dispozitiv Bluetooth"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Baterie utilizată de aplicații"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Opriți sau dezinstalați aplicația"</string>
@@ -2072,7 +2075,7 @@
     <string name="checking_decryption" msgid="8287458611802609493">"Se verifică..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Se pornește Android..."</string>
     <string name="delete" msgid="4219243412325163003">"Ștergeți"</string>
-    <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
+    <string name="misc_files" msgid="6720680815969643497">"Fișiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="select_all" msgid="1562774643280376715">"Selectați-le pe toate"</string>
@@ -2093,7 +2096,7 @@
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Iluminare intermitentă la operații lungi pe firul principal"</string>
-    <string name="pointer_location" msgid="6084434787496938001">"Locaţia indicatorului"</string>
+    <string name="pointer_location" msgid="6084434787496938001">"Locația indicatorului"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Suprapunere care indică date curente pt. atingeri"</string>
     <string name="show_touches" msgid="1356420386500834339">"Afișați atingerile"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Afișați feedback vizual pentru atingeri"</string>
@@ -2195,7 +2198,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Modificările conturilor dvs. pe web vor fi copiate automat pe tabletă.\n\nDe asemenea, unele conturi pot să copieze automat pe web toate modificările pe care le efectuați pe tabletă. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ceea ce modificați în conturi pe web se va reflecta automat și pe telefon.\n\nUnele conturi pot să copieze automat pe web toate modificările de pe telefon. Așa funcționează un Cont Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Opriți sincronizarea automată?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informaţiile recente. În plus, nu veți primi notificări atunci când apar actualizări."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Această acţiune va economisi date și durata bateriei, dar va trebui să sincronizați fiecare cont manual pentru a culege informațiile recente. În plus, nu veți primi notificări atunci când apar actualizări."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de resetare a ciclului de utilizare"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data din fiecare lună:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Setați"</string>
@@ -2240,7 +2243,7 @@
     <string name="vpn_routes" msgid="3818655448226312232">"Rute de redirecționare (ex.: 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nume de utilizator"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Parolă"</string>
-    <string name="vpn_save_login" msgid="6350322456427484881">"Salvați informaţiile contului"</string>
+    <string name="vpn_save_login" msgid="6350322456427484881">"Salvați informațiile contului"</string>
     <string name="vpn_not_used" msgid="9094191054524660891">"(neutilizat)"</string>
     <string name="vpn_no_ca_cert" msgid="8776029412793353361">"(nu verificaţi serverul)"</string>
     <string name="vpn_no_server_cert" msgid="2167487440231913330">"(primit de la server)"</string>
@@ -2248,22 +2251,22 @@
     <string name="vpn_done" msgid="8678655203910995914">"Închideți"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Salvați"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Conectați"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Editaţi profilul VPN"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Editați profilul VPN"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Ștergeți"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Conectați-vă la <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="2555877026824771115">"Deconectați-vă de la VPN."</string>
     <string name="vpn_disconnect" msgid="7426570492642111171">"Deconectați-vă"</string>
     <string name="vpn_version" msgid="1939804054179766249">"Versiunea <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
-    <string name="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
+    <string name="vpn_create" msgid="5628219087569761496">"Adăugați un profil VPN"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Editați profilul"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Ștergeți profilul"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Reţea VPN activată permanent"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la rețea. Traficul de rețea va fi permis numai atunci când sunteți conectat(ă) la această rețea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Activarea permanentă a reţelei VPN necesită o adresă IP, atât pentru server, cât și pentru DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nu există nicio conexiune la rețea. Încercați din nou mai târziu."</string>
-    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editaţi profilul."</string>
+    <string name="vpn_missing_cert" msgid="7972907102570411501">"Lipseşte un certificat. Editați profilul."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistem"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utilizator"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Dezactivați"</string>
@@ -2296,7 +2299,7 @@
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugați utilizator"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"Înainte de a putea crea un profil cu permisiuni limitate, va trebui să configurați blocarea ecranului pentru a vă proteja aplicațiile și datele personale."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Configurați blocarea"</string>
@@ -2315,7 +2318,7 @@
     <string name="user_add_user_title" msgid="2108112641783146007">"Adăugați utilizator nou?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Puteți să permiteți accesul la acest dispozitiv altor persoane creând utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările dispozitivului, cum ar fi setările pentru Wi-Fi, care îi afectează pe toți ceilalți utilizatori.\n\nDupă ce creați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOricare dintre utilizatori poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Când adăugați un utilizator nou, acesta trebuie să-și configureze spațiul.\n\nOrice utilizator poate actualiza aplicațiile pentru toți ceilalți utilizatori."</string>
-    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
+    <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurați utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Asigurați-vă că utilizatorul are posibilitatea de a prelua dispozitivul și de a-și configura spațiul"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurați profilul acum?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurați acum"</string>
@@ -2658,7 +2661,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Solicitați codul PIN înainte de a anula fixarea"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Solicitați parola înainte de a anula fixarea"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Blocați dispozitivul la anularea fixării"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profil de serviciu"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Acest profil de serviciu este gestionat de:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Gestionat de <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimental)"</string>
@@ -2746,7 +2748,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avansate"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurați aplicațiile"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicație necunoscută"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Alegeți un profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisiuni aplicație"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> aplicații cu acces suplimentar"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> din <xliff:g id="COUNT_1">%d</xliff:g> aplicații au această permisiune"</string>
@@ -2906,20 +2907,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modul de culori pentru imagini"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Folosiți sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scară afișaj"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"afișaj densitate zoom scară scalare"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Mică"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normală"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Mare"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Mai mare"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Cea mai mare"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Personalizată (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 3c61a5e..6051561 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не воспроизводить звук при установке или извлечении планшетного ПК из док-станции"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не воспроизводить звук при установке или извлечении телефона"</string>
     <string name="account_settings" msgid="6403589284618783461">"Аккаунты"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Личные данные"</string>
-    <string name="category_work" msgid="8699184680584175622">"Работа"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Аккаунты в рабочем профиле – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Аккаунты в личном профиле"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Рабочий аккаунт – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Отключено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Всегда включено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматическое переключение"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Переход к шифрованию файлов"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Перейти..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Шифрование файлов уже включено"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Перейти к шифрованию отдельных файлов.\n !!Внимание!! Все ваши данные будут удалены.\n Это альфа-версия функции. Возможны ошибки.\n Нажмите \"Очистить и перейти...\"."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Очистить и перейти..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Отключение экрана"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-код для отключения"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запрашивать пароль для отключения блокировки в приложении"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокировать устройство при откл. блокировки в приложении"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Рабочий профиль"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Профилем управляет"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управляется <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(экспериментальная настройка)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Настроить приложения"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Разрешения приложений"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Расширенный доступ: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Разрешено: <xliff:g id="COUNT_0">%d</xliff:g> из <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2928,20 +2929,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Цветовой режим"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Использовать sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Разрешение"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"разрешение экрана увеличение уменьшение"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Маленькое"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Обычное"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Большое"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Очень большое"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Максимальное"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Другое (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 7ced627..baf4de2 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ටැබ්ලටය රඳවනයට දමන විට එයින් ඉවත් කරන විට ශබ්දයක් ඇති නොකරන්න"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"දුරකථනය රඳවනය වෙතින් ඉවත් කරන විට ඊට හෝ ඇතුලත් කරන විට ශබ්දයක් ඇති නොකරන්න"</string>
     <string name="account_settings" msgid="6403589284618783461">"ගිණුම්"</string>
-    <string name="category_personal" msgid="1299663247844969448">"පෞද්ගලික"</string>
-    <string name="category_work" msgid="8699184680584175622">"කාර්යාලය"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"කාර්යාල පැතිකඩ ගිණුම් - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"පුද්ගලික පැතිකඩ ගිණුම්"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"කාර්යාල ගිණුම - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"අබලයි"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"සැමවිට ක්‍රියාත්මක"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"ස්වයංක්‍රීය"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ගොනු සංකේතනයට පරිවර්තනය කරන්න"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"පරිවර්තනය කරන්න ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"දැනටමත් ගොනුව සංකේතනය කර ඇත"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"දත්ත වෙන් කිරීම ගොනු පදනම් සංකේතනයට පරිවර්තනය කරන්න.\n !!අනතුරු ඇඟවීමයි!! මෙය ඔබේ සියලු දත්ත මකනු ඇත.\n මෙම විශේෂාංගය ඇල්ෆා වන අතර, නිවැරදිව ක්‍රියා නොකළ හැකිය.\n දිගටම කරගෙන යාමට \'මකා පරිවර්තනය කරන්න...\' ඔබන්න."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"මකා පරිවර්තනය කරන්න..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"නිද්‍රාව"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"තිරය අක්‍රිය කරන්න"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"අක්‍රියතාවයෙන් <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> පසු"</string>
@@ -2642,7 +2645,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ගැලවීමට පෙර PIN විමසන්න"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ගැලවීමට පෙර මුරපදය විමසන්න"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ගැලවීමට උපාංගය අගුළු දමා ඇත"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"කාර්යාල පැතිකඩ"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"මෙම කාර්යාල පැතිකඩ කළමනාකරණය කරන්නේ:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> විසින් කළමනාකරණය කරන ලදී"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(පරීක්ෂණාත්මක)"</string>
@@ -2727,7 +2729,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"උසස්"</string>
     <string name="configure_apps" msgid="6685680790825882528">"යෙදුම් වින්‍යාස කරන්න"</string>
     <string name="unknown_app" msgid="5275921288718717656">"නොදන්නා යෙදුම"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"පැතිකඩ තෝරන්න"</string>
     <string name="app_permissions" msgid="4148222031991883874">"යෙදුම් අවසර"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> කින් <xliff:g id="COUNT_0">%d</xliff:g> කට අමතර ප්‍රවේශය ඉඩ දෙන ලදී"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"යෙදුම් <xliff:g id="COUNT_1">%d</xliff:g> න් <xliff:g id="COUNT_0">%d</xliff:g> කට ඉඩ දෙන ලදී"</string>
@@ -2884,20 +2885,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"පින්තූර වර්ණ ප්‍රකාරය"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB භාවිතා කරන්න"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"සංදර්ශන පරිමාණය"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"සංදර්ශන ඝනත්ව විශාලන පරිමාණය පරිමාණ කිරීම"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"කුඩා"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"සාමාන්‍ය"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"විශාල"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"වඩා විශාල"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"විශාලතම"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"අභිරුචි (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 271b03d..9ff17f2 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
     <string name="account_settings" msgid="6403589284618783461">"Účty"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osobné"</string>
-    <string name="category_work" msgid="8699184680584175622">"Práca"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Účty pracovných profilov – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Účty osobných profilov"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Pracovný účet – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Vypnuté"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vždy zapnuté"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatický"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertovať na šifrovanie súborov"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertovať…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Súbory sú už šifrované"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Chystáte sa konvertovať dátový oddiel na šifrovanie založené na súboroch.\n !!Upozornenie!! Týmto procesom vymažete všetky dáta.\n Táto funkcia je v alfa verzii a nemusí fungovať správne.\n Ak chcete pokračovať, stlačte tlačidlo „Vymazať a konvertovať…“."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Vymazať a konvertovať…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Vypnutie obrazovky"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred uvoľnením požiadať o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred uvoľnením požiadať o heslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Uzamknúť zariadenie počas uvoľňovania"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Pracovný profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Rozšírené"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurácia aplikácií"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznáma aplikácia"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Výber profilu"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Povolenia aplikácií"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Ďalší prístup povolený <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikácií"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Povolené: <xliff:g id="COUNT_0">%d</xliff:g> z <xliff:g id="COUNT_1">%d</xliff:g> aplikácií"</string>
@@ -2928,20 +2929,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Farebný režim obrázka"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije sa sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Hustota zobrazenia"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"zobrazenie hustota priblížiť upraviť hustotu úprava hustoty"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Malá"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Štandardná"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veľká"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Väčšia"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Najväčšia"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Vlastná (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index ddac4ad..57e59f2 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ne predvajaj zvoka med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ne predvajaj zvoka pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
     <string name="account_settings" msgid="6403589284618783461">"Računi"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Osebno"</string>
-    <string name="category_work" msgid="8699184680584175622">"Služba"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Računi za delovne profile – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Računi za osebne profile"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Delovni račun – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Onemogočeno"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Vedno vklopljeno"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Samodejno"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Preklop na šifriranje podatkov"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Preklop ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Šifriranje podatkov je že uveljavljeno"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Preklop particije s podatki na šifriranje na ravni datotek.\n !!Opozorilo!! S tem bodo izbrisani vsi podatki.\n Ta funkcija je različice alfa, zato morda ne bo delovala pravilno.\n Če želite nadaljevati, pritisnite »Izbriši in preklopi ...«."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Izbriši in preklopi ..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Zaslon se izklopi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po toliko nedejavnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Zahtevaj PIN pred odpenjanjem"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred odpenjanjem vprašaj za geslo"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Pri odpenjanju zakleni napravo"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Delovni profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ta delovni profil upravlja:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Upravlja: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Poskusno)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Dodatno"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguriranje aplikacij"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Neznana aplikacija"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Izbira profila"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Dovoljenja za aplik."</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Dod. dostop dovoljen toliko aplikacijam: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Dovoljene aplikacije: <xliff:g id="COUNT_0">%d</xliff:g> od <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2928,20 +2929,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Način barv slike"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Uporaba sRGB-ja"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Zaslonsko razmerje"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"gostota zaslona povečava razmerje spreminjanje velikosti"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Majhno"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Običajno"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Veliko"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Večje"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Največje"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Po meri (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq-rAL/arrays.xml
index 421d9d1..7500c54 100644
--- a/res/values-sq-rAL/arrays.xml
+++ b/res/values-sq-rAL/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"Të gjitha"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 sekonda"</item>
-    <item msgid="8881760709354815449">"30 sekonda"</item>
-    <item msgid="7589406073232279088">"1 minutë"</item>
-    <item msgid="7001195990902244174">"2 minuta"</item>
-    <item msgid="7489864775127957179">"5 minuta"</item>
-    <item msgid="2314124409517439288">"10 minuta"</item>
-    <item msgid="6864027152847611413">"30 minuta"</item>
+    <item msgid="3342301044271143016">"15 sek."</item>
+    <item msgid="8881760709354815449">"30 sek."</item>
+    <item msgid="7589406073232279088">"1 min."</item>
+    <item msgid="7001195990902244174">"2 min."</item>
+    <item msgid="7489864775127957179">"5 min."</item>
+    <item msgid="2314124409517439288">"10 min."</item>
+    <item msgid="6864027152847611413">"30 min."</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"Asnjëherë"</item>
-    <item msgid="2194151041885903260">"15 sekonda"</item>
-    <item msgid="5892295237131074341">"30 sekonda"</item>
-    <item msgid="3538441365970038213">"1 minutë"</item>
-    <item msgid="412343871668955639">"2 minuta"</item>
-    <item msgid="5076853889688991690">"5 minuta"</item>
-    <item msgid="1903860996174927898">"10 minuta"</item>
-    <item msgid="6415509612413178727">"30 minuta"</item>
+    <item msgid="2194151041885903260">"15 sek."</item>
+    <item msgid="5892295237131074341">"30 sek."</item>
+    <item msgid="3538441365970038213">"1 min."</item>
+    <item msgid="412343871668955639">"2 min."</item>
+    <item msgid="5076853889688991690">"5 min."</item>
+    <item msgid="1903860996174927898">"10 min."</item>
+    <item msgid="6415509612413178727">"30 min."</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"Menjëherë"</item>
-    <item msgid="6736512735606834431">"5 sekonda"</item>
-    <item msgid="8044619388267891375">"15 sekonda"</item>
-    <item msgid="1822002388249545488">"30 sekonda"</item>
-    <item msgid="8538071621211916519">"1 minutë"</item>
-    <item msgid="5663439580228932882">"2 minuta"</item>
-    <item msgid="49888496216106852">"5 minuta"</item>
-    <item msgid="9002737361305019353">"10 minuta"</item>
-    <item msgid="4322676235684793329">"30 minuta"</item>
+    <item msgid="6736512735606834431">"5 sek."</item>
+    <item msgid="8044619388267891375">"15 sek."</item>
+    <item msgid="1822002388249545488">"30 sek."</item>
+    <item msgid="8538071621211916519">"1 min."</item>
+    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="49888496216106852">"5 min."</item>
+    <item msgid="9002737361305019353">"10 min."</item>
+    <item msgid="4322676235684793329">"30 min."</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"E vogël"</item>
@@ -133,8 +133,8 @@
     <item msgid="2330782789550628803">"Jashtë rrezes"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 minuta"</item>
-    <item msgid="8675215713017289017">"5 minuta"</item>
+    <item msgid="8151962652413645395">"2 min."</item>
+    <item msgid="8675215713017289017">"5 min."</item>
     <item msgid="477015974247590543">"1 orë"</item>
     <item msgid="5198271470953124739">"Skadim të kohës së veprimit, asnjëherë!"</item>
   </string-array>
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml
index 7d02755..6a8bb19 100644
--- a/res/values-sq-rAL/strings.xml
+++ b/res/values-sq-rAL/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Mos lësho asnjë tingull kur futet ose hiqet tableti nga stacioni"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Mos lësho asnjë tingull kur futet ose hiqet telefoni nga stacioni"</string>
     <string name="account_settings" msgid="6403589284618783461">"Llogaritë"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personale"</string>
-    <string name="category_work" msgid="8699184680584175622">"Punë"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Llogaritë e profilit të punës - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Llogaritë e profilit personal"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Llogari pune - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Çaktivizuar"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Gjithmonë aktive"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatike"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konverto në enkriptimin e skedarit"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konverto ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkriptimi i skedarit është kryer tashmë"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konverto ndarjen e të dhënave në enkriptimin e bazuar te skedari.\n !!Paralajmërim!! Kjo gjë do të spastrojë të gjitha të dhënat e tua.\n Ky funksion është alfa dhe mund të mos punojë si duhet.\n Shtyp te \"Pastro dhe konverto...\" për të vazhduar."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Pastro dhe konverto..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Në gjendje gjumi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekrani çaktivizohet"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kur, <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> pa aktivitet"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Zhgozhdimi kërkon PIN-in"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Kërko fjalëkalim para heqjes nga gozhdimi"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Kyçe pajisjen kur heq gozhdimin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profili i punës"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ky profil pune menaxhohet nga:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"I menaxhuar nga <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentale)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Të përparuara"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfiguro aplikacionet"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplikacion i panjohur"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Zgjidh profilin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Lejet e aplikacionit"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> nga gjithsej <xliff:g id="COUNT_1">%d</xliff:g> aplikacione lejuan qasje shtesë"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> aplikacione nga <xliff:g id="COUNT_1">%d</xliff:g> të tilla u lejuan"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Modalitti i ngjyrave të figurës"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Përdor sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Shkalla e ekranit"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekrani dendësia shkalla e zmadhimit shkallëzimi"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"E vogël"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normale"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"E madhe"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Më e madhe"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Më e madhja"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"E personalizuar (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 5da1401..123120a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -819,8 +819,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не репродукуј звук приликом постављања таблета на базну станицу или уклањања са ње"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не пуштај звук приликом уметања телефона на постоље или уклањања са њега"</string>
     <string name="account_settings" msgid="6403589284618783461">"Налози"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Лично"</string>
-    <string name="category_work" msgid="8699184680584175622">"Посао"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Налози профила за посао – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Налози личног профила"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Налог за посао – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -843,6 +841,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Онемогућено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Увек укључено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Аутоматски"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертуј у шифровање датотека"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Конвертуј ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Већ се користи шифровање датотека"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Конвертујте шифровање партиције података у шифровање појединачних датотека.\n !!Упозорење!! То ће избрисати све ваше податке.\n Ово је алфа верзија функције и можда неће функционисати исправно.\n Притисните „Избриши и конвертуј...“ да бисте наставили."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Избриши и конвертуј..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Спавање"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Екран се искључује"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
@@ -2657,7 +2660,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Тражи PIN пре откачињања"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Тражи лозинку пре откачињања"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Закључај уређај пре откачињања"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Профил за посао"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Овим профилом за Work управља:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Управља <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментално)"</string>
@@ -2745,7 +2747,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Напредна"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Конфигуришите апликације"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Изаберите профил"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволе за апликације"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Апликације са додатним приступом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Апликације са дозволом (<xliff:g id="COUNT_0">%d</xliff:g> од <xliff:g id="COUNT_1">%d</xliff:g>)"</string>
@@ -2905,20 +2906,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Режим боја слика"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Користи sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Размера приказа"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"приказ густина зумирање размера прилагођавање"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Мала"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Нормална"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Велика"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Већа"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Највећа"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Прилагођена (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 409b1fc..e9c711a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Spela inte upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konton"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personligt"</string>
-    <string name="category_work" msgid="8699184680584175622">"Arbetet"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Jobbprofilkonton – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Personliga profilkonton"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Jobbkonto – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Inaktiverad"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Alltid på"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Automatiskt"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertera till filkryptering"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Konvertera …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Filkryptering används redan"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Konvertera datapartitionen till filbaserad kryptering.\n Varning! All data raderas.\n Detta är en alfafunktion och fel kan uppstå.\n Tryck på Rensa och konvertera om du vill fortsätta."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Rensa och konvertera …"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skärmen stängs av"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Be om pinkod innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Be om lösenord innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten när skärmen lossas"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Arbetsprofil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Den här jobbprofilen hanteras av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Hanteras av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(experimentellt)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Avancerat"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Konfigurera appar"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Okänd app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Välj profil"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Appens behörigheter"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar har ytterligare åtkomst"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> av <xliff:g id="COUNT_1">%d</xliff:g> appar tillåts"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Färgläge för bilder"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Använd sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Skala på skärmen"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"skärmdensitet skala zoom förstoring"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Små"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normalstora"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Stora"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Större"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Störst"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Anpassad (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3c15a74..c559884 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -815,8 +815,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Usicheze sauti wakati unaingiza au kuondoa kompyuta ndogo kutoka kwa gati"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Usichezeshe sauti wakati unapoingiza au kuondoa simu kutoka kwa gati"</string>
     <string name="account_settings" msgid="6403589284618783461">"Akaunti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Ya Kibinafsi"</string>
-    <string name="category_work" msgid="8699184680584175622">"Kazini"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Akaunti za wasifu wa kazini - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Akaunti za wasifu wa binafsi"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Akaunti ya kazini - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -839,6 +837,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Imezimwa"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Imewashwa kila wakati"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatiki"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Badilisha kuwa usimbaji fiche wa faili"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Badilisha ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tayari faili imesimbwa kwa njia fiche"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Badilisha hesabu ya data kuwa usimbaji fiche wa faili. \n !!Onyo!! Hali hii itafuta data yako yote. \n Kipengele hiki ni alpha, na huenda kisifanye kazi vizuri. \n Bonyeza \'Futa na ubadilishe...\'  ili uendelee."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Ifute na uibadilishe..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Skrini huzima"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
@@ -2646,7 +2649,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Omba PIN kabla hujabandua"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Omba nenosiri kabla hujabandua"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Funga kifaa wakati wa kubandua"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Wasifu wa kazi"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Wasifu huu wa kazini unasimamiwa na:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Inasimamiwa na <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Majaribio)"</string>
@@ -2731,7 +2733,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Vipengele vya kina"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Weka mipangilio ya programu"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Programu isiyojulikana"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Chagua Wasifu"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ruhusa za programu"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Idhini ya ufikiaji wa ziada imetolewa kwa programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Inaruhusu programu <xliff:g id="COUNT_0">%d</xliff:g> kati ya <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2888,20 +2889,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Hali ya rangi ya picha"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Tumia sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Kipimo cha mwonekano"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"mwonekano kipimo kukuza uzito nafasi"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Ndogo"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Kawaida"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Kubwa"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Kubwa kiasi"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Kubwa zaidi"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Kipimo maalum cha mwonekano (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index 9527170..92f06ee 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"டாக்கிலிருந்து டேப்லெட்டைச் செருகும்போது அல்லது அகற்றும்போது ஒலியை இயக்க வேண்டாம்"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"மொபைல் வைக்கும் கருவியில் மொபைலைச் செருகும்போது அல்லது அதிலிருந்து அகற்றும்போது ஒலி எழுப்பாதே"</string>
     <string name="account_settings" msgid="6403589284618783461">"கணக்குகள்"</string>
-    <string name="category_personal" msgid="1299663247844969448">"தனிப்பட்டவை"</string>
-    <string name="category_work" msgid="8699184680584175622">"பணியிடம்"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"பணி சுயவிவரக் கணக்குகள் - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"தனிப்பட்ட சுயவிவரக் கணக்குகள்"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"பணி கணக்கு - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"முடக்கப்பட்டது"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"எப்போதும் இயக்கத்தில் வை"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"தானியங்கு"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"கோப்பு முறைமையாக்கத்திற்கு மாற்று"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"மாற்று ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ஏற்கனவே கோப்பு முறைமையாக்கப்பட்டது"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"தரவுப் பகிர்வை, கோப்பு சார்ந்த முறைமையாக்கத்திற்கு மாற்றவும்.\n !!எச்சரிக்கை!! இது எல்லா தரவையும் அழிக்கும்.\n இது ஆல்பா நிலை அம்சமாக இருப்பதால் சரியாகச் செயல்படாமல் போகக்கூடும்.\n தொடர, \'அழித்து, மாற்று...\' என்பதை அழுத்தவும்."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"அழித்து, மாற்று..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"உறக்கநிலையிலிரு"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"திரை முடக்கப்படும்"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> செயல்படாமல் இருப்பின்"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"அகற்றும் முன் பின்னைக் கேள்"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"அகற்றும் முன் கடவுச்சொல்லைக் கேள்"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"திரையை விலக்கும்போது சாதனத்தைப் பூட்டு"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"பணி சுயவிவரம்"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"இந்தப் பணி சுயவிவரத்தை நிர்வகிப்பது:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"நிர்வகிப்பது: <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(சோதனை முயற்சி)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"மேம்பட்டவை"</string>
     <string name="configure_apps" msgid="6685680790825882528">"பயன்பாடுகளை உள்ளமை"</string>
     <string name="unknown_app" msgid="5275921288718717656">"அறியப்படாத பயன்பாடு"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"சுயவிவரத்தைத் தேர்வுசெய்யவும்"</string>
     <string name="app_permissions" msgid="4148222031991883874">"பயன்பாட்டு அனுமதிகள்"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"கூடுதல் அனுமதிகள் வழங்கப்பட்ட பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"அனுமதிக்கப்படும் பயன்பாடுகள்: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"படத்தின் வண்ணப் பயன்முறை"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGBஐப் பயன்படுத்தும்"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"திரை அளவு"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"திரை அடர்த்தி ஜூம் அளவு அளவிடல்"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"சிறியது"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"இயல்பு"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"பெரியது"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"கொஞ்சம் பெரியது"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"மிகப் பெரியது"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"தனிப்பயன் (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index e440b8a..f1a8f75 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"టాబ్లెట్‌ను డాక్‌లో చొప్పించినప్పుడు లేదా దాని నుండి తీసివేసినప్పుడు ధ్వనిని ప్లే చేయవద్దు"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ఫోన్‌ను డాక్‌లో చొప్పించినప్పుడు లేదా దాని నుండి తీసివేసినప్పుడు ధ్వనిని ప్లే చేయవద్దు"</string>
     <string name="account_settings" msgid="6403589284618783461">"ఖాతాలు"</string>
-    <string name="category_personal" msgid="1299663247844969448">"వ్యక్తిగతం"</string>
-    <string name="category_work" msgid="8699184680584175622">"కార్యాలయం"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"కార్యాలయ ప్రొఫైల్ ఖాతాలు - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"వ్యక్తిగత ప్రొఫైల్ ఖాతాలు"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"కార్యాలయ ఖాతా - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"నిలిపివేయబడింది"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ఎల్లప్పుడూ ఆన్‌లో ఉంచు"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"స్వయంచాలకం"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"ఫైల్ గుప్తీకరణకు మార్చు"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"మార్చు..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ఫైల్ ఇప్పటికే గుప్తీకరించబడింది"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"డేటా భాగాన్ని ఫైల్ ఆధారిత గుప్తీకరణకు మార్చండి.\n !!హెచ్చరిక!! దీని వలన మీ డేటా మొత్తం తీసివేయబడుతుంది.\n ఈ లక్షణం ఆల్ఫా మరియు సరిగ్గా పని చేయకపోవచ్చు.\n కొనసాగించడానికి \'తొలగించి, మార్చు...\' నొక్కండి."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"తొలగించి, మార్చు..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"నిద్రావస్థ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"స్క్రీన్‌ను ఆఫ్ చేయాల్సిన సమయం"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"నిష్క్రియంగా ఉన్న <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> తర్వాత"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"అన్‌పిన్ చేయడానికి PINను అడుగు"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"అన్‌పిన్ చేయడానికి ముందు పాస్‌వర్డ్ కోసం అడుగు"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"అన్‌పిన్ చేస్తున్నప్పుడు పరికరాన్ని లాక్ చేయి"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"కార్యాలయ ప్రొఫైల్‌"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ఈ కార్యాలయ ప్రొఫైల్ వీరి నిర్వహణలో ఉంది:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"నిర్వహిస్తున్నది <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ప్రయోగాత్మకం)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"అధునాతనం"</string>
     <string name="configure_apps" msgid="6685680790825882528">"అనువర్తనాలను కాన్ఫిగర్ చేయండి"</string>
     <string name="unknown_app" msgid="5275921288718717656">"తెలియని అనువర్తనం"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"ప్రొఫైల్‌ను ఎంచుకోండి"</string>
     <string name="app_permissions" msgid="4148222031991883874">"అనువర్తన అనుమతులు"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలకు అదన. ప్రాప్యత అనుమతించబడింది"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_1">%d</xliff:g>లో <xliff:g id="COUNT_0">%d</xliff:g> అనువర్తనాలు అనుమతించబడ్డాయి"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"చిత్రం రంగు మోడ్"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ఉపయోగిస్తుంది"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ప్రదర్శన ప్రమాణం"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ప్రదర్శన సాంద్రత జూమ్ కొలత కొలిచే ప్రమాణం"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"చిన్నగా"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"సాధారణం"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"పెద్దగా"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"చాలా పెద్దగా"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"అతి పెద్దగా"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"అనుకూలం (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a881346..57e265f 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ไม่ต้องเล่นเสียงเมื่อใส่หรือนำแท็บเล็ตออกจากฐานรอง"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ไม่เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</string>
     <string name="account_settings" msgid="6403589284618783461">"บัญชี"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ส่วนตัว"</string>
-    <string name="category_work" msgid="8699184680584175622">"ที่ทำงาน"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"บัญชีโปรไฟล์งาน - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"บัญชีโปรไฟล์ส่วนตัว"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"บัญชีงาน - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"ปิดใช้แล้ว"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"เปิดใช้เสมอ"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"อัตโนมัติ"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"แปลงเป็นการเข้ารหัสไฟล์"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"แปลง ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"เข้ารหัสไฟล์แล้ว"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"แปลงพาร์ทิชันข้อมูลเป็นการเข้ารหัสแบบไฟล์\n !!คำเตือน!! การดำเนินการนี้จะลบข้อมูลทั้งหมดของคุณ\n คุณลักษณะนี้เป็นแบบอัลฟา และอาจทำงานไม่เป็นปกติ\n กด \"ลบและแปลง...\" เพื่อดำเนินการต่อ"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"ลบและแปลง..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"หน้าจอปิด"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ขอ PIN ก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ขอรหัสผ่านก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ล็อกอุปกรณ์เมื่อเลิกตรึง"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"โปรไฟล์งาน"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"โปรไฟล์งานนี้ได้รับการจัดการโดย:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"จัดการโดย <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ทดลอง)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
     <string name="configure_apps" msgid="6685680790825882528">"กำหนดค่าแอป"</string>
     <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
     <string name="app_permissions" msgid="4148222031991883874">"สิทธิ์ของแอป"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"อนุญาตการเข้าถึงเพิ่มเติมให้แอป <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"อนุญาต <xliff:g id="COUNT_0">%d</xliff:g> จาก <xliff:g id="COUNT_1">%d</xliff:g> แอปแล้ว"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"โหมดสีของรูปภาพ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"ใช้ sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ระดับการแสดงผล"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"การแสดงผล ความหนาแน่น ซูม ระดับ การปรับระดับ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"เล็ก"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"ปกติ"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"ใหญ่"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"ใหญ่ขึ้น"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"ใหญ่ที่สุด"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"กำหนดเอง (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 000190e..8a11d64 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Huwag mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Huwag mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
     <string name="account_settings" msgid="6403589284618783461">"Mga Account"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
-    <string name="category_work" msgid="8699184680584175622">"Trabaho"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Mga account ng profile sa trabaho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Mga account ng personal na profile"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Account sa trabaho - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Naka-disable"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Palaging naka-on"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Awtomatiko"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"I-convert at gawing pag-encrypt ng file"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"I-convert ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Na-encrypt na ang file"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"I-convert ang partition ng data at gawing pag-encrypt na batay sa file.\n !!Babala!! Kapag isinagawa mo ito, mabubura ang lahat ng iyong data.\n Maituturing na alpha ang feature na ito at maaaring hindi ito gumana nang maayos .\n Pindutin ang \'I-wipe at i-convert...\' upang makapagpatuloy."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"I-wipe at i-convert..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Pag-off ng screen"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Humingi ng PIN bago mag-unpin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Humingi ng password bago mag-unpin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"I-lock ang device kapag nag-a-unpin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Profile sa trabaho"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ang profile sa trabahong ito ay pinapamahalaan ng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Pinapamahalaan ng <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Pang-eksperimento)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Advanced"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Mag-configure ng mga app"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Hindi kilalang app"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Pumili ng Profile"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Mga pahintulot sa app"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Pinapayagan ang karagdagang access sa <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> app"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Pinapayagan ang <xliff:g id="COUNT_0">%d</xliff:g> sa <xliff:g id="COUNT_1">%d</xliff:g> (na) app"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Mode ng kulay ng larawan"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Gamitin ang sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Scale ng display"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"display density zoom scale pag-ii-scale"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Maliit"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Malaki"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Mas malaki"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Pinakamalaki"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Custom (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4d56112..520542e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
     <string name="account_settings" msgid="6403589284618783461">"Hesaplar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Kişisel"</string>
-    <string name="category_work" msgid="8699184680584175622">"İş"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"İş profili hesapları - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Kişisel profil hesapları"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"İş hesabı - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Devre dışı"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Her zaman açık"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Otomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Dosya şifrelemeye dönüştür"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Dönüştür..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dosya şifreleme zaten uygulandı"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Veri bölmesini dosya tabanlı şifrelemeye dönüştür.\n !!Dikkat!! Bu işlem tüm verilerinizi siler\n Bu özellik henüz alfa aşamasındadır ve düzgün çalışmayabilir.\n Devam etmek için \"Sil ve dönüştür...\" seçeneğine basın."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Sil ve dönüştür..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekran kapanır"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Sab. kald. önce PIN\'i sor"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Sabitlemeyi kaldırmadan önce şifre sor"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Sabitlemeyi kaldırırken cihazı kilitle"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"İş profili"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu iş profili şunun tarafından yönetiliyor:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tarafından yönetiliyor"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Deneysel)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"İleri düzey"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Uygulamaları yapılandır"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil Seçin"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Uygulama izinleri"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya ek erişim izni veriliyor"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g> uygulamaya izin veriliyor"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Resim renk modu"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB\'yi kullan"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Görüntüyü ölçekle"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekran yoğunluk yakınlaştırma ölçek ölçekleme"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Küçük"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Normal"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Büyük"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Daha büyük"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"En büyük"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Özel (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 7ab2698..51136c3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -827,8 +827,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Не грати звук під час вставл. чи виймання пристрою зі станції"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Не грати звук під час вставл. чи виймання тел. зі станції"</string>
     <string name="account_settings" msgid="6403589284618783461">"Облікові записи"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Особисте"</string>
-    <string name="category_work" msgid="8699184680584175622">"Робота"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Робочі облікові записи (керує <xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Особисті облікові записи"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Робочий обліковий запис (керує <xliff:g id="MANAGED_BY">%s</xliff:g>)"</string>
@@ -851,6 +849,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Вимкнено"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Завжди ввімкнено"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Автоматично"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Конвертувати в зашифрований файл"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Конвертування…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Уже конвертовано в зашифрований файл"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Конвертувати розділи даних у зашифрований файл.\n Застереження. Усі дані буде стерто.\n Ця функція доступна в альфа-версії та може працювати неналежним чином.\n Щоб продовжити, натисніть \"Стерти та конвертувати…\""</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Стерти та конвертувати…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Вимикати екран"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Коли минає <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
@@ -2674,7 +2677,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-код для відкріплення"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Запитувати пароль перед відкріпленням"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Блокувати пристрій після відкріплення"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Робочий профіль"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Цим робочим профілем керує додаток"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Керує додаток <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Експериментальна функція)"</string>
@@ -2765,7 +2767,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Розширені налаштування"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Налаштування додатків"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невідомий додаток"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Вибрати профіль"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Дозволи додатків"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Додатковий доступ мають стільки додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Дозволено додатків: <xliff:g id="COUNT_0">%d</xliff:g> з <xliff:g id="COUNT_1">%d</xliff:g>"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 2ec4bf3..21a7b8e 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"ڈاک میں ٹیبلٹ داخل کرنے یا اس سے ہٹاتے وقت آواز نہ چلائیں"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"ڈاک میں فون داخل کرنے یا اس سے ہٹانے وقت آواز نہ چلائیں"</string>
     <string name="account_settings" msgid="6403589284618783461">"اکاؤنٹس"</string>
-    <string name="category_personal" msgid="1299663247844969448">"ذاتی"</string>
-    <string name="category_work" msgid="8699184680584175622">"دفتر"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"دفتری پروفائل اکاؤنٹس - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"ذاتی پروفائل اکاؤنٹس"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"دفتری اکاؤنٹ - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"غیر فعال"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"ہمیشہ آن"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"خودکار"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"فائل مرموز کاری میں بدلیں"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"بدلیں…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"فائل پہلے ہی مرموز شدہ ہے"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"ڈیٹا پارٹیشن کو فائل پر مبنی مرموز کاری میں بدلیں۔\n !!تنبیہ!! اس سے آپ کا سارا ڈیٹا مٹ جائے گا۔\n یہ خصوصیت الفا ہے اور شاید ٹھیک طرح سے کام نہ کرے۔\n جاری رکھنے کیلئے \'صاف کریں اور بدلیں…\' دبائیں۔"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"صاف کریں اور بدلیں…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"سلیپ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"اسکرین آف ہوجاتی ہے"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"غیر فعالیت کے <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> بعد"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏پن ہٹانے سے پہلے PIN طلب کریں"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"پن ہٹانے سے پہلے پاس ورڈ طلب کریں"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"پن ہٹاتے وقت آلہ کو مقفل کریں"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"دفتر کا پروفائل"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"یہ دفتری پروفائل اس کے زیر انتظام ہے:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> کے زیر انتظام ہے"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجرباتی)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
     <string name="configure_apps" msgid="6685680790825882528">"ایپس کنفیگر کریں"</string>
     <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
     <string name="app_permissions" msgid="4148222031991883874">"ایپ کی اجازتیں"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اضافی رسائی کی اجازت دی گئی"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> از <xliff:g id="COUNT_1">%d</xliff:g> ایپس کو اجازت دی گئی"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"تصویری رنگ موڈ"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"‏sRGB استعمال کریں"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"ڈسپلے اسکیل"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ڈسپلے کثافت کے زوم اسکیل کی اسکیلنگ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"چھوٹا"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"عام"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"بڑا"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"قدرے بڑا"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"سب سے بڑا"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"حسب ضرورت (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 50dadf6..c2838e9 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -46,7 +46,7 @@
     <string name="volte_provisioned_flag_off" msgid="6168612015904744405">"VoLTE tomonidan ta’minlangan bayroqchani o‘chirib qo‘yish"</string>
     <string name="lte_ram_dump_on" msgid="8568568019520172177">"lte ram dump‘ni yoqib qo‘yish"</string>
     <string name="lte_ram_dump_off" msgid="2514507918652378283">"lte ram dump‘ni o‘chirish"</string>
-    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM-karta manzillar kitobini ko‘rish"</string>
+    <string name="radioInfo_menu_viewADN" msgid="8743377494429930831">"SIM karta manzillar kitobini ko‘rish"</string>
     <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ruxsat etilgan raqamlarni ko‘rish"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Terish xizmati raqamlarini ko‘rish"</string>
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"PDP ro‘yxatini olish"</string>
@@ -79,7 +79,7 @@
     <string name="large_font" msgid="599055175160971446">"Katta"</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"USB xotira"</string>
-    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD-karta"</string>
+    <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD karta"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Noma’lum"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Quvvat olmoqda"</string>
     <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Quvvat olmoqda (AC)"</string>
@@ -146,8 +146,8 @@
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Boshqa so‘ralmasin"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Xabarga kirish so‘rovi"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s xabarlaringizni ochmoqchi. %2$s‘ga ruxsat berilsinmi?"</string>
-    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM-karta ma’lumotlariga kirish so‘rovi"</string>
-    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM-karta ma’lumotlarini ko‘rmoqchi. SIM-karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
+    <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM karta ma’lumotlariga kirish so‘rovi"</string>
+    <string name="bluetooth_sap_acceptance_dialog_text" msgid="4414253873553608690">"“<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>” qurilmasi SIM karta ma’lumotlarini ko‘rmoqchi. SIM karta ma’lumotlarini ko‘rishga ruxsat bersangiz, qurilmangizdagi ulanishlar vaqtincha o‘chib qoladi. “<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>” qurilmasiga ruxsat berish."</string>
     <string name="date_and_time" msgid="9062980487860757694">"Sana va vaqt"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"Vaqt zonasini tanlang"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"Ko‘rinishi:"</string>
@@ -241,7 +241,7 @@
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Planshet haqida"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Telefon haqida"</string>
     <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"USB xotira"</string>
-    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD-karta"</string>
+    <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD karta"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Proksi sozlamalari"</string>
     <string name="cancel" msgid="6859253417269739139">"Bekor qilish"</string>
     <string name="okay" msgid="1997666393121016642">"OK"</string>
@@ -657,7 +657,7 @@
     <string name="wifi_status" msgid="4824568012414605414">"Holati"</string>
     <string name="wifi_speed" msgid="3526198708812322037">"Aloqa tezligi"</string>
     <string name="wifi_frequency" msgid="7791090119577812214">"Chastota"</string>
-    <string name="wifi_ip_address" msgid="1440054061044402918">"IP-manzil"</string>
+    <string name="wifi_ip_address" msgid="1440054061044402918">"IP manzil"</string>
     <string name="passpoint_label" msgid="6381371313076009926">"Bu orqali saqlangan"</string>
     <string name="passpoint_content" msgid="8447207162397870483">"<xliff:g id="NAME">%1$s</xliff:g> hisobi ma’lumotlari"</string>
     <string name="wifi_eap_method" msgid="8529436133640730382">"EAP usuli"</string>
@@ -710,7 +710,7 @@
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Operatsiya uchun chastotalar oralig‘ini ko‘rsating"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Antena chastotasini sozlashda muammo paydo bo‘ldi."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-manzil"</string>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP-manzil"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP manzil"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saqlangan tarmoqlar"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP sozlamalari"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Saqlash"</string>
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Planshetni dokga ulash yoki dokdan chiqarish paytida ovoz yangramasin"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Telefonni dokka ulash yoki dokdan uzish paytida ovoz chiqarilmasin"</string>
     <string name="account_settings" msgid="6403589284618783461">"Hisoblar"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Shaxsiy"</string>
-    <string name="category_work" msgid="8699184680584175622">"Ish"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ishchi profil hisoblari – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Shaxsiy profil hisoblari"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Ishchi hisob – <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"O‘chiq"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Har doim yoniq tursin"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Avtomatik"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faylli shifrga o‘girish"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"O‘girish …"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl allaqachon shifrlangan"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Ma’lumotlaringizni faylli shifrga o‘giring.\n !!Diqqat!! Barcha ma’lumotlaringizni o‘chirib tashlanadi.\n Ushbu funksiya hali alfa-versiya va to‘g‘ri ishlamasligi mumkin.\n Davom etish uchun “O‘chirib tashlash va o‘girish…” tugmasini bosing."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"O‘chirib tashlash va o‘girish…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan so‘ng"</string>
@@ -855,7 +858,7 @@
     <string name="doze_title" msgid="2259176504273878294">"Tashqi ekran"</string>
     <string name="doze_summary" msgid="7128970177894383698">"Qurilmani qo‘limga olsam yoki bildirishnoma kelsa, ekran uyqu rejimidan chiqarilsin"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-karta qulfi sozlamalari"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM karta qulfi sozlamalari"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"SIM-kartaga qulf o‘rnatish"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kartani qulflash"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kartani qulflash"</string>
@@ -864,32 +867,32 @@
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Planshetdan foydalanish uchun PIN-kod so‘raladi"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Telefondan foydalanish uchun PIN-kod so‘raladi"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM kartaning PIN kodini o‘zgartirish"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM-karta PIN kodi"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"SIM karta PIN kodi"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kartani qulflash"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM-karta qulfini ochish"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"SIM-karta eski PIN kodi"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM karta qulfini ochish"</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"SIM karta eski PIN kodi"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"SIM kartaga yangi PIN-kod"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Yangi PIN kodni qayta kiriting"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"SIM-karta PIN kodi"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"SIM karta PIN kodi"</string>
     <string name="sim_bad_pin" msgid="2345230873496357977">"Noto‘g‘ri PIN-kod"</string>
     <string name="sim_pins_dont_match" msgid="1695021563878890574">"PIN-kodlar bir-biriga mos kelmadi"</string>
     <string name="sim_change_failed" msgid="3602072380172511475">"PIN-kod o‘zgartirilmadi.\nNoto‘g‘ri PIN-kod terildi shekilli."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM-karta PIN kodi o‘zgartirildi"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM-karta qulfi holati o‘zgarmadi.\nPIN-kod noto‘g‘ri kiritildi shekilli."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"SIM karta PIN kodi o‘zgartirildi"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"SIM karta qulfi holati o‘zgarmadi.\nPIN-kod noto‘g‘ri kiritildi shekilli."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"OK"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Bekor qilish"</string>
-    <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM-karta topildi"</string>
+    <string name="sim_multi_sims_title" msgid="9159427879911231239">"Bir nechta SIM karta topildi"</string>
     <string name="sim_multi_sims_summary" msgid="7018740080801483990">"Mobil internetdan foydalanish uchun SIM kartani tanlang."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Internet SIM kartasi o‘zg-mi?"</string>
     <string name="sim_change_data_message" msgid="1313940695939674633">"Mobil internet uchun <xliff:g id="OLD_SIM">%2$s</xliff:g> o‘rniga <xliff:g id="NEW_SIM">%1$s</xliff:g> ishlatilsinmi?"</string>
-    <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM-karta o‘zg-sinmi?"</string>
-    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM-karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
+    <string name="sim_preferred_title" msgid="5567909634636045268">"Ma’qul SIM karta o‘zg-sinmi?"</string>
+    <string name="sim_preferred_message" msgid="301251431163650167">"<xliff:g id="NEW_SIM">%1$s</xliff:g> – qurilmangizdagi yagona SIM karta. Undan qo‘ng‘iroqlar, mobil internet va SMS xabarlar uchun foydalanmoqchimisiz?"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM karta noto‘g‘ri PIN kodi. Endi siz qurilmangiz qulfini ochish uchun operatoringizga murojaat qilishingiz lozim."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
       <item quantity="other">SIM kartaning PIN kodi noto‘g‘ri. Sizda yana <xliff:g id="NUMBER_1">%d</xliff:g> ta urinish qoldi.</item>
       <item quantity="one">SIM kartaning PIN kodi noto‘g‘ri. Qurilmani qulfdan chiqarish uchun sizda yana <xliff:g id="NUMBER_0">%d</xliff:g> ta urinish qoldi.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"SIM-karta PIN kodining amaliyoti bajarilmadi!"</string>
+    <string name="pin_failed" msgid="1848423634948587645">"SIM karta PIN kodining amaliyoti bajarilmadi!"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"Planshet holati"</string>
     <string name="device_info_settings" product="default" msgid="475872867864762157">"Telefon holati"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Tizim yangilanishlari"</string>
@@ -934,7 +937,7 @@
     <string name="status_awake_time" msgid="2393949909051183652">"Uyg‘oqlik vaqti"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Ichki xotira"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"USB xotira"</string>
-    <string name="sd_memory" product="default" msgid="151871913888051515">"SD-karta"</string>
+    <string name="sd_memory" product="default" msgid="151871913888051515">"SD karta"</string>
     <string name="memory_available" msgid="5052397223077021181">"Bo‘sh"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Mavjud (faqat o‘qish uchun)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jami xotira"</string>
@@ -1009,8 +1012,8 @@
     <string name="storage_format_success" msgid="3023144070597190555">"<xliff:g id="NAME">%1$s</xliff:g> formatlandi"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"<xliff:g id="NAME">%1$s</xliff:g> ni formatlab bo‘lmadi"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"Xotira qur-masini qayta nomlash"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"Bu SD-karta (<xliff:g id="NAME_0">^1</xliff:g>) xavfsiz chiqarib olindi, lekin hali undan foydalansa bo‘ladi. \n\nBu SD-kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni tizimga ulang."</string>
-    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"Bu SD-karta (<xliff:g id="NAME_0">^1</xliff:g>) shikastlangan. \n\nBu SD-kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni sozlash lozim."</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"Bu SD karta (<xliff:g id="NAME_0">^1</xliff:g>) xavfsiz chiqarib olindi, lekin hali undan foydalansa bo‘ladi. \n\nBu SD kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni tizimga ulang."</string>
+    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"Bu SD karta (<xliff:g id="NAME_0">^1</xliff:g>) shikastlangan. \n\nBu SD kartadan (<xliff:g id="NAME_1">^1</xliff:g>) foydalanish uchun avval uni sozlash lozim."</string>
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Bu qurilma ushbu SD-kartani (<xliff:g id="NAME_0">^1</xliff:g>) qo‘llab-quvvatlamaydi. \n\nBu SD-kartani (<xliff:g id="NAME_1">^1</xliff:g>) mazkur qurilma bilan ishlatish uchun avval uni sozlang."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Formatlagandan so‘ng, “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini boshqa qurilmalarda foydalanishingiz mumkin. \n\n“<xliff:g id="NAME_1">^1</xliff:g>” kartasidagi barcha ma’lumotlar o‘chirib tashlanadi, shuning uchun uning zaxira nusxasini olib qo‘yishni tavsiya etamiz. \n\n"<b>"Rasm va boshqa fayllarning nusxasini saqlab oling."</b>" \nMedia fayllaringizni ushbu qurilmadagi muqobil xotiraga ko‘chiring yoki USB kabeldan foydalanib ularni kompyuterga o‘tkazing. \n\n"<b>"Ilovalarning zaxira nusxasini saqlab oling."</b>" \n“<xliff:g id="NAME_6">^1</xliff:g>” kartasida joylashgan barcha ilovalar va ularning ma’lumotlari o‘chirib tashlanadi. Ularni xotira qurilmasiga ko‘chirib o‘tkazishni tavsiya etamiz."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"Agar “<xliff:g id="NAME_0">^1</xliff:g>” xotira kartasini chiqarib olsangiz, unda joylashgan ilovalar ishlashdan to‘xtaydi va undagi media fayllar uni qayta kiritmaguningizcha ishlamaydi."</b>" \n\n“<xliff:g id="NAME_1">^1</xliff:g>” kartasi faqat ushbu qurilmada ishlaydigan qilib formatlangan. U boshqa hech qanday qurilma bilan ishlamaydi."</string>
@@ -1024,7 +1027,7 @@
     <string name="storage_detail_cached" msgid="8547136365247818567">"Kesh ma’lumotlari"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Boshqa"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
-    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD-karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
+    <string name="storage_detail_dialog_other" msgid="4894289482062047165">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
     <string name="storage_detail_dialog_user" msgid="1675756743326079688">"<xliff:g id="USER_0">^1</xliff:g> rasm, musiqa, film, ilova yoki <xliff:g id="SIZE">^2</xliff:g> xotirani egallagan boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -1304,7 +1307,7 @@
     <string name="external_code_size_label" msgid="3459343140355961335">"USB xotira ilovasi"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Ma’lumotlar"</string>
     <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB xotira ma‘lumotlari"</string>
-    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-karta"</string>
+    <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD karta"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"O‘chirish"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Ilovani barcha foydalanuvchilar uchun ochirib yuborish"</string>
     <string name="install_text" msgid="884360662922471113">"O‘rnatish"</string>
@@ -2387,7 +2390,7 @@
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Ovoz va kommunikatsiya xususiyatlarini oshirish uchun LTE tarmog‘idan foydalaning (tavsiya etiladi)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Tarmoq turi"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (tavsiya etiladi)"</string>
-    <string name="work_sim_title" msgid="4843322164662606891">"Ishchi SIM-karta"</string>
+    <string name="work_sim_title" msgid="4843322164662606891">"Ishchi SIM karta"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Ilovalar va kontentga kirish"</string>
     <string name="user_rename" msgid="8523499513614655279">"QAYTA NOMLASH"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"Ilova cheklovlarini o‘rnatish"</string>
@@ -2420,24 +2423,24 @@
     <string name="sim_cellular_data_unavailable_summary" msgid="3654805961942166428">"Mobil internet SIM kartasini tanlash uchun bosing"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Bundan doim qo‘ng‘iroqlar uchun foyd-sin"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Internet uchun SIM kartani tanlang"</string>
-    <string name="data_switch_started" msgid="2040761479817166311">"Mobil internet uchun SIM-karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
+    <string name="data_switch_started" msgid="2040761479817166311">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
     <string name="select_sim_for_calls" msgid="3503094771801109334">"Quyidagi bilan qo‘ng‘iroq qilish"</string>
     <string name="sim_select_card" msgid="211285163525563293">"SIM kartani tanlang"</string>
     <string name="sim_card_number_title" msgid="7845379943474336488">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
-    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM-karta uyasi bo‘sh"</string>
-    <string name="sim_editor_name" msgid="1722945976676142029">"SIM-karta nomi"</string>
-    <string name="sim_name_hint" msgid="7038643345238968930">"SIM-karta nomini kiriting"</string>
+    <string name="sim_slot_empty" msgid="8964505511911854688">"SIM karta uyasi bo‘sh"</string>
+    <string name="sim_editor_name" msgid="1722945976676142029">"SIM karta nomi"</string>
+    <string name="sim_name_hint" msgid="7038643345238968930">"SIM karta nomini kiriting"</string>
     <string name="sim_editor_title" msgid="4034301817366627870">"%1$d-SIM karta teshigi"</string>
     <string name="sim_editor_carrier" msgid="5684523444677746573">"Aloqa operatori"</string>
     <string name="sim_editor_number" msgid="6705955651035440667">"Raqam"</string>
-    <string name="sim_editor_color" msgid="2542605938562414355">"SIM-karta rangi"</string>
+    <string name="sim_editor_color" msgid="2542605938562414355">"SIM karta rangi"</string>
     <string name="sim_card_select_title" msgid="6668492557519243456">"SIM kartani tanlang"</string>
     <string name="color_orange" msgid="4417567658855022517">"To‘q sariq"</string>
     <string name="color_purple" msgid="3888532466427762504">"Binafsharang"</string>
-    <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM-karta solinmagan"</string>
-    <string name="sim_status_title" msgid="6744870675182447160">"SIM-karta holati"</string>
+    <string name="sim_no_inserted_msg" msgid="210316755353227087">"SIM karta solinmagan"</string>
+    <string name="sim_status_title" msgid="6744870675182447160">"SIM karta holati"</string>
     <string name="sim_call_back_title" msgid="5181549885999280334">"Birlamchi SIM kartadan qaytarib qo‘ng‘iroq qilish"</string>
-    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM-karta"</string>
+    <string name="sim_outgoing_call_title" msgid="1019763076116874255">"Chiqish qo‘ng‘iroqlari uchun mo‘ljallangan SIM karta"</string>
     <string name="sim_other_call_settings" msgid="8247802316114482477">"Boshqa qo‘ng‘iroq sozlamalari"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"Tarmoq yukini kam-sh usuli"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"Tarmoq nomi ko‘rsatilmasin"</string>
@@ -2446,7 +2449,7 @@
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> sh.s.b"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartalar o‘zgartirildi."</string>
     <string name="sim_notification_summary" msgid="5024470200658902406">"Sozlash uchun bosing"</string>
-    <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM-karta"</string>
+    <string name="sim_pref_divider" msgid="6778907671867621874">"Quyidagi uchun afzal ko‘rilgan SIM karta"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Har safar so‘ralsin"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Tanlash zarur"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Sozlamalar"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Yechishda PIN-kod so‘ralsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Yechishdan oldin parol so‘ralsin"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Yechish vaqtida qurilma qulflansin"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Ishchi profil"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Bu ishchi profil quyidagi tomonidan boshqariladi:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> tomonidan boshqariladi"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Tajribaviy)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Qo‘shimcha"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Ilovalarni sozlash"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Noma’lum ilova"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Profil tanlash"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Ilovalar uchun ruxsatlar"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Qo‘shimcha ruxsatga ega ilovalar: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Ruxsat berilgan ilovalar: <xliff:g id="COUNT_0">%d</xliff:g> / <xliff:g id="COUNT_1">%d</xliff:g>"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Rang rejimi"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ranglaridan foydalanish"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Ekran ko‘lami"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"ekran zichlik ko‘lam miqyos oshirish"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Kichkina"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Odatiy"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Katta"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Kattaroq"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Eng katta"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Moslashtirilgan (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 230b897..de3e7bd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Không phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
     <string name="account_settings" msgid="6403589284618783461">"Tài khoản"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Cá nhân"</string>
-    <string name="category_work" msgid="8699184680584175622">"Cơ quan"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Tài khoản hồ sơ công việc - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Tài khoản hồ sơ cá nhân"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Tài khoản công việc - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Đã tắt"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Luôn bật"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Tự động"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Chuyển đổi sang mã hóa tệp"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Chuyển đổi ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Đã mã hóa tệp"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Chuyển đổi phân vùng dữ liệu sang chế độ mã hóa dựa trên tệp.\n !!Cảnh báo!! Tính năng này sẽ xóa tất cả dữ liệu của bạn.\n Tính năng này là alpha và có thể không hoạt động đúng cách.\n Nhấn \'Xóa và chuyển đổi...\' để tiếp tục."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Xóa và chuyển đổi..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian chờ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -2640,7 +2643,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Hỏi mã PIN trước khi bỏ ghim"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Hỏi mật khẩu trước khi bỏ khóa màn hình"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khóa thiết bị khi bỏ khóa màn hình"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Hồ sơ công việc"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Hồ sơ công việc này được quản lý bằng:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Quản lý bởi <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Thử nghiệm)"</string>
@@ -2725,7 +2727,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Định cấu hình ứng dụng"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Chọn hồ sơ"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Giấy phép ứng dụng"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"Đã cấp quyền truy cập bổ sung cho <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"Đã cho phép <xliff:g id="COUNT_0">%d</xliff:g> trong số <xliff:g id="COUNT_1">%d</xliff:g> ứng dụng"</string>
@@ -2882,20 +2883,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"Chế độ màu của ảnh"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"Sử dụng sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"Tỷ lệ hiển thị"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"mật độ hiển thị tỷ lệ thu phóng chia tỷ lệ"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"Nhỏ"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"Bình thường"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"Lớn"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"Lớn hơn"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"Lớn nhất"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"Tùy chỉnh (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index d1614da..2b9851e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"平板电脑插入基座或拔出时不发出声音"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手机插入基座或拔出时不发出声音"</string>
     <string name="account_settings" msgid="6403589284618783461">"帐户"</string>
-    <string name="category_personal" msgid="1299663247844969448">"个人"</string>
-    <string name="category_work" msgid="8699184680584175622">"工作"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"工作资料帐户 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"个人资料帐户"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"工作帐户 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,16 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"始终开启"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自动"</string>
+    <!-- no translation found for convert_to_file_encryption (3060156730651061223) -->
+    <skip />
+    <!-- no translation found for convert_to_file_encryption_enabled (4342629236458204730) -->
+    <skip />
+    <!-- no translation found for convert_to_file_encryption_done (7859766358000523953) -->
+    <skip />
+    <!-- no translation found for convert_to_fbe_warning (6406541045331190366) -->
+    <skip />
+    <!-- no translation found for button_convert_fbe (8142438555983531496) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"屏幕关闭"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"无操作<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
@@ -2640,7 +2648,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定屏幕前要求输入 PIN 码"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定屏幕前要求输入密码"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定屏幕时锁定设备"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"工作资料"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"此工作资料由以下应用管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"（实验性）"</string>
@@ -2725,7 +2732,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
     <string name="configure_apps" msgid="6685680790825882528">"配置应用"</string>
     <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
     <string name="app_permissions" msgid="4148222031991883874">"应用所需权限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已授予 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）其他权限"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授权 <xliff:g id="COUNT_0">%d</xliff:g> 个应用（共 <xliff:g id="COUNT_1">%d</xliff:g> 个）"</string>
@@ -2882,20 +2888,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"图片颜色模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"显示比例"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"显示 密度 缩放 比例 调整比例"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"正常"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"较大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"自定义 (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index e8af948..f40d228 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人"</string>
-    <string name="category_work" msgid="8699184680584175622">"公司"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"工作設定檔帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人設定檔帳戶"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"工作帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"永遠開啟"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"轉換為檔案加密"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"轉換…"</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"已加密檔案"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"轉換資料分區至檔案式加密。\n！警告！這會清除您的所有資料。\n 這是測試功能，可能未能正常運作。\n如要繼續，請按 [清除並轉換…] 。"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"清除並轉換…"</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -2645,7 +2648,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"公司檔案"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個工作設定檔由以下應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
@@ -2730,7 +2732,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
     <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式額外存取權 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已允許 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 140c52e..567c34b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"手機插入底座或離開底座時，不要播放音效"</string>
     <string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
-    <string name="category_personal" msgid="1299663247844969448">"個人"</string>
-    <string name="category_work" msgid="8699184680584175622">"公司"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Work 設定檔帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"個人設定檔帳戶"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"Work 帳戶 - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"已停用"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"一律開啟"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"自動"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"轉換成檔案加密"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"轉換..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"已將檔案加密"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"將資料分割轉換成檔案式加密。\n警告！這項操作將清除您的所有資料。\n這是 Alpha 版功能，可能無法正常運作。\n按下 [清除並轉換...] 即可繼續。"</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"清除並轉換..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"螢幕關閉時"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
@@ -2644,7 +2647,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"取消固定時鎖定裝置"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"工作設定檔"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"這個 Work 設定檔是由下列應用程式管理："</string>
     <string name="managing_admin" msgid="8843802210377459055">"由 <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> 管理"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(實驗性)"</string>
@@ -2729,7 +2731,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
     <string name="configure_apps" msgid="6685680790825882528">"設定應用程式"</string>
     <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
     <string name="app_permissions" msgid="4148222031991883874">"應用程式權限"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"已將額外存取權授予 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"已授權 <xliff:g id="COUNT_0">%d</xliff:g> 個應用程式 (共 <xliff:g id="COUNT_1">%d</xliff:g> 個)"</string>
@@ -2886,20 +2887,12 @@
   </string-array>
     <string name="picture_color_mode" msgid="4560755008730283695">"螢幕色彩模式"</string>
     <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string>
-    <!-- no translation found for force_density_preference_title (7269059903952009908) -->
-    <skip />
-    <!-- no translation found for force_density_keywords (3810424110118041972) -->
-    <skip />
-    <!-- no translation found for force_density_summary_small (5481649550774706354) -->
-    <skip />
-    <!-- no translation found for force_density_summary_normal (4706658853225294667) -->
-    <skip />
-    <!-- no translation found for force_density_summary_large (4636190645503741863) -->
-    <skip />
-    <!-- no translation found for force_density_summary_very_large (8328063057394895318) -->
-    <skip />
-    <!-- no translation found for force_density_summary_extremely_large (846919277362198243) -->
-    <skip />
-    <!-- no translation found for force_density_summary_custom (6663681104268192485) -->
-    <skip />
+    <string name="force_density_preference_title" msgid="7269059903952009908">"顯示比例"</string>
+    <string name="force_density_keywords" msgid="3810424110118041972">"顯示 密度 縮放 比例 調整比例"</string>
+    <string name="force_density_summary_small" msgid="5481649550774706354">"小"</string>
+    <string name="force_density_summary_normal" msgid="4706658853225294667">"適中"</string>
+    <string name="force_density_summary_large" msgid="4636190645503741863">"大"</string>
+    <string name="force_density_summary_very_large" msgid="8328063057394895318">"較大"</string>
+    <string name="force_density_summary_extremely_large" msgid="846919277362198243">"最大"</string>
+    <string name="force_density_summary_custom" msgid="6663681104268192485">"自訂 (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3f60ef0..8954b7d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -811,8 +811,6 @@
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="4308252722466813560">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="2034927992716667672">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
     <string name="account_settings" msgid="6403589284618783461">"Ama-akhawunti"</string>
-    <string name="category_personal" msgid="1299663247844969448">"Okomuntu siqu"</string>
-    <string name="category_work" msgid="8699184680584175622">"Umsebenzi"</string>
     <string name="accessibility_category_work" msgid="4339262969083355720">"Ama-akhawunti wephrofayela yomsebenzi - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
     <string name="accessibility_category_personal" msgid="1263518850905945594">"Ama-akhawunti wephrofayela yomuntu siqu"</string>
     <string name="accessibility_work_account_title" msgid="1231830766637939527">"I-akhawunti yomsebenzi - <xliff:g id="MANAGED_BY">%s</xliff:g>"</string>
@@ -835,6 +833,11 @@
     <string name="night_mode_no" msgid="9171772244775838901">"Kukhutshaziwe"</string>
     <string name="night_mode_yes" msgid="2218157265997633432">"Njalo ivuliwe"</string>
     <string name="night_mode_auto" msgid="7508348175804304327">"Okuzenzakalelayo"</string>
+    <string name="convert_to_file_encryption" msgid="3060156730651061223">"Phendulisela ekubethelweni kwefayela"</string>
+    <string name="convert_to_file_encryption_enabled" msgid="4342629236458204730">"Iyaphendulela ..."</string>
+    <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sekuvele kubethelwe ngefayela"</string>
+    <string name="convert_to_fbe_warning" msgid="6406541045331190366">"Phendulela kwehlukaniswa kuya ekubethelweni okususelwe kufayela.\n !!Isexwayiso!! Lokhu kuzosula yonke idatha yakho.\n Lesi sici siyi-alpha, futhi singahle singasebenzi kahle.\n Cindezela okuthi \'Sula futhi uphendulele...\' ukuze uqhubeke."</string>
+    <string name="button_convert_fbe" msgid="8142438555983531496">"Sula futhi uphendulele..."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Isikrini siyavaleka"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
@@ -2647,7 +2650,6 @@
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Cela iphinikhodi ngaphambi kokuphina"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Cela iphasiwedi ngaphambi kokususa ukuphina"</string>
     <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Khiya idivayisi uma ususa ukuphina"</string>
-    <string name="managed_user_title" msgid="8101244883654409696">"Iphrofayela yomsebenzi"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Le phrofayela yomsebenzi iphethwe ngu:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Iphethwe ngu-<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Ukuhlola)"</string>
@@ -2732,7 +2734,6 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Okuthuthukisiwe"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Lungisa izinhlelo zokusebenza"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Uhlelo lokusebenza olungaziwa"</string>
-    <string name="choose_profile" msgid="8229363046053568878">"Khetha iphrofayela"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Izimvume zohlelo lokusebenza"</string>
     <string name="app_permissions_summary" msgid="2098173899436407221">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe ekufinyeleleni okungeziwe"</string>
     <string name="app_permissions_group_summary" msgid="2721303391744909000">"<xliff:g id="COUNT_0">%d</xliff:g> kuzinhlelo zokusebenza ezingu-<xliff:g id="COUNT_1">%d</xliff:g> ezivunyelwe"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bbf9c80..df4d7a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4014,15 +4014,6 @@
     <!-- Title for print service settings screen [CHAR LIMIT=25] -->
     <string name="print_settings_title">Print services</string>
 
-    <!-- Title for a warning message about security implications of enabling a print service,
-         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
-    <string name="print_service_security_warning_title">Use
-         <xliff:g id="service" example="My Print Service">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning message about security implications of enabling a print service,
-         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
-    <string name="print_service_security_warning_summary">Your document may pass through
-        one or more servers on its way to the printer.</string>
-
     <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
     <string name="print_no_services_installed">No services installed</string>
 
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0a265de..059b934 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -85,6 +85,20 @@
         <item name="@*android:errorColor">@color/setup_lock_pattern_view_error_color_light</item>
     </style>
 
+    <style name="SetupWizardTheme.Transparent" parent="SetupWizardTheme">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
+    <style name="SetupWizardTheme.Light.Transparent" parent="SetupWizardTheme.Light">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowAnimationStyle">@null</item>
+    </style>
+
     <style name="PreferenceThemeOverlay.SetupWizard" parent="PreferenceThemeOverlay.v14.Material">
         <item name="preferenceFragmentStyle">@style/SetupWizardPreferenceFragmentStyle</item>
     </style>
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index b7a2447..71501b1 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -41,6 +41,14 @@
         }
     }
 
+    public static int getTransparentTheme(Intent intent) {
+        if (WizardManagerHelper.isLightTheme(intent, true)) {
+            return R.style.SetupWizardTheme_Light_Transparent;
+        } else {
+            return R.style.SetupWizardTheme_Transparent;
+        }
+    }
+
     /**
      * Sets the immersive mode related flags based on the extra in the intent which started the
      * activity.
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index fe0bb63..b00f98e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -50,7 +50,7 @@
 public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
         implements FingerprintEnrollSidecar.Listener {
 
-    private static final String TAG_SIDECAR = "sidecar";
+    static final String TAG_SIDECAR = "sidecar";
 
     private static final int PROGRESS_BAR_MAX = 10000;
     private static final int FINISH_DELAY = 250;
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 63d9335..8122d02 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -23,11 +23,12 @@
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
 import com.android.settings.R;
+import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener;
 
 /**
  * Activity explaining the fingerprint sensor location for fingerprint enrollment.
  */
-public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
+public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implements Listener {
 
     private static final int CONFIRM_REQUEST = 1;
     private static final int ENROLLING = 2;
@@ -35,6 +36,7 @@
 
     private FingerprintLocationAnimationView mAnimation;
     private boolean mLaunchedConfirmLock;
+    private FingerprintEnrollSidecar mSidecar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,6 +56,14 @@
     protected void onStart() {
         super.onStart();
         mAnimation.startAnimation();
+        mSidecar = (FingerprintEnrollSidecar) getFragmentManager().findFragmentByTag(
+                FingerprintEnrollEnrolling.TAG_SIDECAR);
+        if (mSidecar == null) {
+            mSidecar = new FingerprintEnrollSidecar();
+            getFragmentManager().beginTransaction()
+                    .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR).commit();
+        }
+        mSidecar.setListener(this);
     }
 
     @Override
@@ -125,4 +135,20 @@
     protected int getMetricsCategory() {
         return MetricsLogger.FINGERPRINT_FIND_SENSOR;
     }
+
+    @Override
+    public void onEnrollmentHelp(CharSequence helpString) {
+    }
+
+    @Override
+    public void onEnrollmentError(int errMsgId, CharSequence errString) {
+    }
+
+    @Override
+    public void onEnrollmentProgressChange(int steps, int remaining) {
+        // Activity on the sensor should auto-advance to the enrolling step
+        mSidecar.setListener(null);
+        getFragmentManager().beginTransaction().remove(mSidecar).commit();
+        onNextButtonClick();
+    }
 }
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index fd24edf..4f047b4 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -17,13 +17,10 @@
 package com.android.settings.print;
 
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.app.LoaderManager;
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.Loader;
 import android.content.pm.PackageInfo;
@@ -75,12 +72,10 @@
  * Fragment with print service settings.
  */
 public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
-        implements DialogInterface.OnClickListener, SwitchBar.OnSwitchChangeListener {
+        implements SwitchBar.OnSwitchChangeListener {
 
     private static final int LOADER_ID_PRINTERS_LOADER = 1;
 
-    private static final int DIALOG_ID_ENABLE_WARNING = 1;
-
     private final SettingsContentObserver mSettingsContentObserver =
             new SettingsContentObserver(new Handler()) {
         @Override
@@ -122,9 +117,6 @@
     private CharSequence mAddPrintersTitle;
     private Intent mAddPrintersIntent;
 
-    private CharSequence mEnableWarningTitle;
-    private CharSequence mEnableWarningMessage;
-
     private ComponentName mComponentName;
 
     private PrintersAdapter mPrintersAdapter;
@@ -201,48 +193,6 @@
         PrintSettingsUtils.writeEnabledPrintServices(getActivity(), services);
     }
 
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        CharSequence title = null;
-        CharSequence message = null;
-        switch (dialogId) {
-            case DIALOG_ID_ENABLE_WARNING:
-                title = mEnableWarningTitle;
-                message = mEnableWarningMessage;
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-        return new AlertDialog.Builder(getActivity())
-                .setTitle(title)
-                .setMessage(message)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, this)
-                .setNegativeButton(android.R.string.cancel, this)
-                .create();
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        final boolean checked;
-        switch (which) {
-            case DialogInterface.BUTTON_POSITIVE:
-                checked = true;
-                mSwitchBar.setCheckedInternal(checked);
-                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
-                onPreferenceToggled(mPreferenceKey, checked);
-                break;
-            case DialogInterface.BUTTON_NEGATIVE:
-                checked = false;
-                mSwitchBar.setCheckedInternal(checked);
-                getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
-                onPreferenceToggled(mPreferenceKey, checked);
-                break;
-            default:
-                throw new IllegalArgumentException();
-        }
-    }
-
     private ListView getBackupListView() {
         return (ListView) getView().findViewById(R.id.backup_list);
     }
@@ -322,17 +272,7 @@
         mToggleSwitch.setOnBeforeCheckedChangeListener(new ToggleSwitch.OnBeforeCheckedChangeListener() {
             @Override
             public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
-                if (checked) {
-                    if (!TextUtils.isEmpty(mEnableWarningMessage)) {
-                        mSwitchBar.setCheckedInternal(false);
-                        getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
-                        showDialog(DIALOG_ID_ENABLE_WARNING);
-                        return true;
-                    }
-                    onPreferenceToggled(mPreferenceKey, true);
-                } else {
-                    onPreferenceToggled(mPreferenceKey, false);
-                }
+                onPreferenceToggled(mPreferenceKey, checked);
                 return false;
             }
         });
@@ -395,14 +335,6 @@
             }
         }
 
-        // Enable warning title.
-        mEnableWarningTitle = arguments.getCharSequence(
-                PrintSettingsFragment.EXTRA_ENABLE_WARNING_TITLE);
-
-        // Enable warning message.
-        mEnableWarningMessage = arguments.getCharSequence(
-                PrintSettingsFragment.EXTRA_ENABLE_WARNING_MESSAGE);
-
         // Component name.
         mComponentName = ComponentName.unflattenFromString(arguments
                 .getString(PrintSettingsFragment.EXTRA_SERVICE_COMPONENT_NAME));
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 60e4123..4cfd21b 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -85,8 +85,6 @@
     static final String EXTRA_PREFERENCE_KEY = "EXTRA_PREFERENCE_KEY";
     static final String EXTRA_CHECKED = "EXTRA_CHECKED";
     static final String EXTRA_TITLE = "EXTRA_TITLE";
-    static final String EXTRA_ENABLE_WARNING_TITLE = "EXTRA_ENABLE_WARNING_TITLE";
-    static final String EXTRA_ENABLE_WARNING_MESSAGE = "EXTRA_ENABLE_WARNING_MESSAGE";
     static final String EXTRA_SETTINGS_TITLE = "EXTRA_SETTINGS_TITLE";
     static final String EXTRA_SETTINGS_COMPONENT_NAME = "EXTRA_SETTINGS_COMPONENT_NAME";
     static final String EXTRA_ADD_PRINTERS_TITLE = "EXTRA_ADD_PRINTERS_TITLE";
@@ -255,13 +253,6 @@
             PrintServiceInfo printServiceInfo = PrintServiceInfo.create(
                     installedService, getActivity());
 
-            CharSequence applicationLabel = installedService.loadLabel(getPackageManager());
-
-            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
-                    R.string.print_service_security_warning_title, applicationLabel));
-            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
-                    R.string.print_service_security_warning_summary, applicationLabel));
-
             String settingsClassName = printServiceInfo.getSettingsActivityName();
             if (!TextUtils.isEmpty(settingsClassName)) {
                 extras.putString(EXTRA_SETTINGS_TITLE,
diff --git a/src/com/android/settings/search/DynamicIndexableContentMonitor.java b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
index e54168c..05880f0 100644
--- a/src/com/android/settings/search/DynamicIndexableContentMonitor.java
+++ b/src/com/android/settings/search/DynamicIndexableContentMonitor.java
@@ -234,7 +234,8 @@
     private void handlePackageAvailable(String packageName) {
         if (!mAccessibilityServices.contains(packageName)) {
             final Intent intent = getAccessibilityServiceIntent(packageName);
-            if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+            List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+            if (services != null && !services.isEmpty()) {
                 mAccessibilityServices.add(packageName);
                 Index.getInstance(mContext).updateFromClassNameResource(
                         AccessibilitySettings.class.getName(), false, true);
@@ -244,7 +245,8 @@
         if (mHasFeaturePrinting) {
             if (!mPrintServices.contains(packageName)) {
                 final Intent intent = getPrintServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mPrintServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             PrintSettingsFragment.class.getName(), false, true);
@@ -255,7 +257,8 @@
         if (mHasFeatureIme) {
             if (!mImeServices.contains(packageName)) {
                 Intent intent = getIMEServiceIntent(packageName);
-                if (!mContext.getPackageManager().queryIntentServices(intent, 0).isEmpty()) {
+                List<?> services = mContext.getPackageManager().queryIntentServices(intent, 0);
+                if (services != null && !services.isEmpty()) {
                     mImeServices.add(packageName);
                     Index.getInstance(mContext).updateFromClassNameResource(
                             InputMethodAndLanguageSettings.class.getName(), false, true);
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 9cadef9..b15a6e4 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -25,7 +25,9 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import com.android.settings.SetupWizardUtils;
 import com.android.settingslib.wifi.AccessPoint;
+import com.android.setupwizardlib.util.WizardManagerHelper;
 
 public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
         DialogInterface.OnDismissListener {
@@ -40,9 +42,13 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        final Intent intent = getIntent();
+        if (WizardManagerHelper.isSetupWizardIntent(intent)) {
+            setTheme(SetupWizardUtils.getTransparentTheme(intent));
+        }
+
         super.onCreate(savedInstanceState);
 
-        final Intent intent = getIntent();
         final Bundle accessPointState = intent.getBundleExtra(KEY_ACCESS_POINT_STATE);
         AccessPoint accessPoint = null;
         if (accessPointState != null) {