Automatic translation import

Change-Id: I66da73c79bb494d63cc007ac8ac3d8cd09b5d4f9
2024-02-08 04:29:07 +02:00 · 2022-02-13 02:57:41 +02:00 · 2022-01-12 20:47:44 +01:00 · 2022-01-08 13:54:40 +01:00 · 2021-05-16 12:19:49 +00:00 · 2021-04-19 15:22:33 +02:00
101 changed files with 1344 additions and 592 deletions
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \
    setupdesign

 LOCAL_STATIC_JAVA_LIBRARIES := \
-    libphonenumber \
    org.lineageos.platform.internal

 LOCAL_JAVA_LIBRARIES := \
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -41,6 +41,7 @@
    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
    <uses-permission android:name="lineageos.permission.HARDWARE_ABSTRACTION_ACCESS" />
    <uses-permission android:name="android.permission.BACKUP" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
    <uses-permission android:name="lineageos.permission.FINISH_SETUP" />
    <uses-permission android:name="lineageos.permission.WRITE_SETTINGS" />
    <uses-permission android:name="lineageos.permission.WRITE_SECURE_SETTINGS" />
@@ -49,6 +50,9 @@
        android:name="lineageos.permission.FINISH_SETUP"
        android:protectionLevel="signatureOrSystem" />

+    <protected-broadcast android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE"
+                         android:permission="lineageos.permission.FINISH_SETUP"/>
+
    <protected-broadcast android:name="org.lineageos.setupwizard.SETUP_FINISHED"
                         android:permission="lineageos.permission.FINISH_SETUP"/>

@@ -231,7 +235,7 @@
            </intent-filter>
        </activity>

-        <activity android:name=".FingerprintActivity"
+        <activity android:name=".BiometricActivity"
                  android:label="@string/activity_label_empty"
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
@@ -239,7 +243,7 @@
                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>
@@ -262,7 +266,6 @@
                  android:excludeFromRecents="true"
                  android:configChanges="mcc|mnc"
                  android:immersive="true"
-                  android:exported="false"
                  android:windowSoftInputMode="stateAlwaysHidden">
            <intent-filter>
                <action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP"/>
--- a/privapp_whitelist_org.lineageos.setupwizard.xml
+++ b/privapp_whitelist_org.lineageos.setupwizard.xml
@@ -21,6 +21,7 @@
        <permission name="android.permission.CHANGE_CONFIGURATION"/>
        <permission name="android.permission.GET_ACCOUNTS_PRIVILEGED"/>
        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>
        <permission name="android.permission.MANAGE_USERS"/>
        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
        <permission name="android.permission.SET_TIME"/>
--- a/res/drawable/ic_face.xml
+++ b/res/drawable/ic_face.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/black"
+        android:pathData="M10.25,13c0,0.69-0.56,1.25-1.25,1.25S7.75,13.69,7.75,13S8.31,11.75,9,11.75S10.25,12.31,10.25,13z M15,11.75 c-0.69,0-1.25,0.56-1.25,1.25s0.56,1.25,1.25,1.25s1.25-0.56,1.25-1.25S15.69,11.75,15,11.75z M22,12c0,5.52-4.48,10-10,10 S2,17.52,2,12S6.48,2,12,2S22,6.48,22,12z M20,12c0-0.78-0.12-1.53-0.33-2.24C18.97,9.91,18.25,10,17.5,10 c-3.13,0-5.92-1.44-7.76-3.69c-1.05,2.56-3.14,4.57-5.74,5.55C4.01,11.9,4,11.95,4,12c0,4.41,3.59,8,8,8S20,16.41,20,12z" />
+    <path
+        android:pathData="M0,0h24v24H0V0z" />
+</vector>
--- a/res/layout/setup_fingerprint.xml
+++ b/res/layout/setup_fingerprint.xml
@@ -39,14 +39,14 @@
                style="@style/PageContent">

                <TextView
+                    android:id="@+id/setup_biometric_summary"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    style="@style/PageSummaryText"
                    android:textSize="16sp"
                    android:paddingLeft="@dimen/content_margin_left"
                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:text="@string/fingerprint_setup_summary" />
+                    android:paddingRight="@dimen/location_text_margin_right"/>

                <TextView
                    android:layout_width="match_parent"
@@ -59,9 +59,10 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textStyle="bold"
-                    android:text="@string/fingerprint_setup_backup_lock_method"/>
+                    android:text="@string/biometric_setup_backup_lock_method"/>

                <TextView
+                    android:id="@+id/setup_add_biometric"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="24dp"
@@ -71,11 +72,10 @@
                    android:drawablePadding="24dp"
                    android:gravity="center_vertical"
                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:text="@string/fingerprint_setup_add_fingerprint"/>
+                    android:textStyle="bold"/>

                <TextView
-                    android:id="@+id/setup_fingerprint"
+                    android:id="@+id/setup_biometric"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:paddingLeft="@dimen/content_margin_left"
@@ -83,8 +83,8 @@
                    android:gravity="center_vertical"
                    android:textSize="16sp"
                    android:textAllCaps="true"
-                    android:textColor="@color/fingerprint_setup_text_color"
-                    android:text="@string/fingerprint_setup_screen_lock_setup"/>
+                    android:textColor="@color/biometric_setup_text_color"
+                    android:text="@string/biometric_setup_screen_lock_setup"/>

            </LinearLayout>
        </ScrollView>
--- a/res/raw/lineage_wizard_script.xml
+++ b/res/raw/lineage_wizard_script.xml
@@ -58,10 +58,10 @@
    </WizardAction>

    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
-        <result wizard:action="fingerprint_settings" />
+        <result wizard:action="biometric_settings" />
    </WizardAction>

-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
        <result wizard:action="lockscreen_settings" />
    </WizardAction>

--- a/res/raw/wizard_script.xml
+++ b/res/raw/wizard_script.xml
@@ -80,6 +80,9 @@
    </WizardAction>
    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_qr_provision_flow" id="qr_provision_flow" />
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="oem_post_setup">
+        <result wizard:action="restore" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
        <result wizard:action="finish" />
    </WizardAction>
    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -59,13 +59,13 @@
    <string name="setup_device_locked">Die toestel is gesluit deur die gebruiker.</string>
    <string name="setup_require_cyanogen_label"><b>Jou rekening wagwoord sal vereis word</b> om jou toestel te gebruik, selfs na \'n fabriek herstel.</string>
    <string name="setup_device_locked_instructions"><i>Om hierdie funksie te aan/af te skakel, gaan asseblief na Instellings &gt; Sekuriteit</i></string>
-    <string name="settings_fingerprint_setup_title">Kies nog \'n skerm sluit tipe</string>
-    <string name="settings_fingerprint_setup_details">Hoe wil jy jou skerm sluit?</string>
+    <string name="settings_biometric_setup_title">Kies nog \'n skerm sluit tipe</string>
+    <string name="settings_biometric_setup_details">Hoe wil jy jou skerm sluit?</string>
    <string name="fingerprint_setup_title">Vingerafdruk opstelling</string>
    <string name="fingerprint_setup_summary">Om jou vingerafdruk sensor te gebruik om jou skerm te ontsluit, benodig jy:</string>
-    <string name="fingerprint_setup_backup_lock_method">Stel \'n tweede ontsluit metode op</string>
    <string name="fingerprint_setup_add_fingerprint">Voeg jou vingerafdruk by</string>
-    <string name="fingerprint_setup_screen_lock_setup">Stel skerm sluit op</string>
+    <string name="biometric_setup_backup_lock_method">Stel \'n tweede ontsluit metode op</string>
+    <string name="biometric_setup_screen_lock_setup">Stel skerm sluit op</string>
    <string name="sim_locale_changed">%1$s SIM opgespoor</string>
    <string name="settings_lockscreen_setup_title">Kies skerm sluit tipe</string>
    <string name="settings_lockscreen_setup_details">Hoe wil jy jou skerm sluit?</string>
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">هل تريد استخدام البيانات الخلوية أثناء عملية الإعداد؟ قد يخضع تشغيل البيانات الخلوية إلى تطبيق رسوم بيانات.</string>
    <string name="no">لا</string>
    <string name="yes">نعم</string>
+    <string name="data_sim_name">شريحة <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">مكالمة طوارئ</string>
    <string name="setup_services">ميزات LineageOS</string>
    <string name="services_explanation" product="tablet">تعمل هذه الخدمات على توسيع نطاق إمكانيات كمبيوترك اللوحي. ستُستخدم البيانات بحسب <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
@@ -61,13 +62,16 @@
    <string name="setup_device_locked">هذا الجهاز تم قفله من قبل المستخدم.</string>
    <string name="setup_require_cyanogen_label"><b>يتطلب كلمة مرور حسابك</b> حتى تتمكن من استخدام الجهاز حتى بعد إعادة تعيين المصنع.</string>
    <string name="setup_device_locked_instructions"><i>من أجل تشغيل/تعطيل هذه الميزة، الرجاء إذهب إلى إعدادات &gt; الأمان</i></string>
-    <string name="settings_fingerprint_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
-    <string name="settings_fingerprint_setup_details">كيف تريد إقفال الشاشة؟</string>
+    <string name="settings_biometric_setup_title">حدد نوعاً احتياطياً لشاشة القفل</string>
+    <string name="settings_biometric_setup_details">كيف تريد إقفال الشاشة؟</string>
    <string name="fingerprint_setup_title">إنشاء بصمة الإصبع</string>
    <string name="fingerprint_setup_summary">لاستخدام مستشعر بصمات الأصابع لفتح شاشتك، سيكون عليك:</string>
-    <string name="fingerprint_setup_backup_lock_method">إنشاء طريقة احتياطية لإلغاء إقفال الشاشة</string>
    <string name="fingerprint_setup_add_fingerprint">أضف بصمتك</string>
-    <string name="fingerprint_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
+    <string name="face_setup_title">إعداد الوجه</string>
+    <string name="face_setup_summary">لاستخدام وجهك في فتح شاشتك، سيكون عليك:</string>
+    <string name="face_setup_add_face">إضافة وجهك</string>
+    <string name="biometric_setup_backup_lock_method">إنشاء طريقة احتياطية لإلغاء إقفال الشاشة</string>
+    <string name="biometric_setup_screen_lock_setup">إنشاء إقفال الشاشة</string>
    <string name="sim_locale_changed">تم اكتشاف %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">حدد نوع شاشة القفل</string>
    <string name="settings_lockscreen_setup_details">كيف تريد إقفال الشاشة؟</string>
@@ -75,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">حماية هاتفك</string>
    <string name="lockscreen_setup_summary"><b>حماية هذا الجهاز</b> وطلب رقم تعريف شخصي أو نمط أو كلمة مرور لإلغاء قفل الشاشة.</string>
    <string name="lockscreen_setup_screen_lock_setup">إعداد</string>
+    <string name="intro_restore_title">استعادة التطبيقات والبيانات</string>
+    <string name="intro_restore_subtitle" product="tablet">إذا كان لديك نسخة احتياطية من آخر جهاز لوحي بنظام LineageOS، يمكنك استعادتها هنا.</string>
+    <string name="intro_restore_subtitle" product="default">إذا كان لديك نسخة احتياطية من آخر هاتف بنظام LineageOS، يمكنك استعادتها هنا.</string>
+    <string name="intro_restore_button">استعادة من نسخة احتياطية</string>
 </resources>
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">আনলক</string>
    <string name="setup_device_locked">ডিভাইচটো ব্যৱহাৰকৰ্তাৰ দ্বাৰা লক কৰা হৈছে।</string>
    <string name="setup_device_locked_instructions"><i>এই বৈশিষ্ট্যটো অন/অফ কৰিবলৈ অনুগ্ৰহ কৰি ছেটিংচ &gt; নিৰাপত্তা লৈ যাওক</i></string>
-    <string name="settings_fingerprint_setup_title">স্ক্ৰীণৰ বেকআপ লকৰ প্ৰকাৰ চয়ন কৰক</string>
-    <string name="settings_fingerprint_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
+    <string name="settings_biometric_setup_title">স্ক্ৰীণৰ বেকআপ লকৰ প্ৰকাৰ চয়ন কৰক</string>
+    <string name="settings_biometric_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
    <string name="fingerprint_setup_title">আঙুলিৰছাপ ছেটআপ</string>
    <string name="fingerprint_setup_summary">আপোনাৰ স্ক্ৰীণ আনলক কৰিবলৈ আঙুলিৰছাপ চেনচৰ ব্যৱহাৰ কৰিবলৈ, আপোনাৰ প্ৰয়োজন হ\'ব:</string>
-    <string name="fingerprint_setup_backup_lock_method">দ্বিতীয় এটা আনলক পদ্ধতি ছেটআপ কৰক</string>
    <string name="fingerprint_setup_add_fingerprint">আপোনাৰ আঙুলিৰছাপ যোগ কৰক</string>
-    <string name="fingerprint_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
+    <string name="biometric_setup_backup_lock_method">দ্বিতীয় এটা আনলক পদ্ধতি ছেটআপ কৰক</string>
+    <string name="biometric_setup_screen_lock_setup">স্ক্ৰীণ লক ছেটআপ কৰক</string>
    <string name="sim_locale_changed">%1$s SIM চিনাক্ত কৰা হৈছে</string>
    <string name="settings_lockscreen_setup_details">আপুনি আপোনাৰ স্ক্ৰীণ লক কেনেকৈ কৰিবলৈ বিচাৰিব?</string>
 </resources>
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -19,59 +19,53 @@
    <string name="app_name">Encontu pa la configuración</string>
    <string name="next">Siguiente</string>
    <string name="skip">Saltar</string>
-    <string name="start">Entamar</string>
+    <string name="start">Comenzar</string>
    <string name="done">Fecho</string>
-    <string name="ok">Aceutar</string>
-    <string name="loading">Un segundu\u2026</string>
-    <string name="setup_complete">Completóse la configuración</string>
+    <string name="ok">D\'acuerdu</string>
+    <string name="loading">Un segundín\u2026</string>
    <string name="setup_welcome">Afáyate</string>
    <string name="setup_locale">Llingua</string>
-    <string name="setup_wifi">Esbilla de Wi-Fi</string>
    <string name="setup_sim_missing">Falta la tarxeta SIM</string>
-    <string name="setup_choose_data_sim">Escueyi una SIM pa datos</string>
-    <string name="setup_location">Servicios d\'allugamientu</string>
+    <string name="setup_location">Servicios de llocalización</string>
    <string name="setup_other">Otros servicios</string>
    <string name="setup_datetime">Data y hora</string>
    <string name="setup_current_date">Data actual</string>
    <string name="setup_current_time">Hora actual</string>
-    <string name="sim_missing_summary" product="tablet">Nun se deteutó denguna tarxeta SIM na tableta. Pa inxertar una, llei les instrucciones que vienen col preséu.</string>
-    <string name="sim_missing_summary" product="default">Nun se deteutó denguna tarxeta SIM nel to teléfonu. Pa inxertar una, llei les instrucciones que vienen col preséu.</string>
-    <string name="choose_data_sim_summary" product="tablet">¿Qué SIM quies usar pa los datos? La tarxeta SIM esbillada podría xenerar cargos de rede darréu que va usase pa configurar la tableta.</string>
-    <string name="choose_data_sim_summary" product="default">¿Qué SIM quies usar pa los datos? La tarxeta SIM esbillada podría xenerar cargos de rede darréu que va usase pa configurar el teléfonu.</string>
-    <string name="date_time_summary">Afita\'l to fusu horariu y axusta la data y hora actuales si ye preciso</string>
-    <string name="backup_data_summary"><b>Copia de seguranza</b> de los datos d\'aplicación, les contraseñes Wi-Fi y otros axustes nos sirvidores de Google</string>
-    <string name="other_services_summary">Estos servicios ponen a Google a trabayar pot ti, y pues activalos o desactivalos en cualesquier momentu. Los datos usaránse acordies cola <xliff:g id="name" example="Política de privacidá">%s</xliff:g> de Google.</string>
-    <string name="location_services_summary">Los servicios d\'allugamientu permiten al sistema y aplicaciones de terceros recoyer y usar datos como\'l to allugamientu aproximáu. Por exemplu, una aplicación pue usar l\'allugamientu aproximáu p\'allugar cafeteríes averaes.</string>
-    <string name="location_access_summary"><b>Permitir que les aplicaciones pidan el to permisu</b> pa usar la información d\'allugamientu. Esto podría incluyir el to allugamientu actual y pasáu.</string>
-    <string name="setup_mobile_data">Activación de datos móviles</string>
-    <string name="setup_mobile_data_no_service">Ensin serviciu</string>
-    <string name="setup_mobile_data_emergency_only">Namái llamaes d\'emerxencia</string>
-    <string name="enable_mobile_data_summary">¿Quies usar los datos móviles na configuración? Activalos quiciabes puean tar suxetos a cargos de datos.</string>
+    <string name="sim_missing_summary" product="tablet">Nun se detectó nenguna tarxeta SIM na tableta. Pa inxertar una, llei les instrucciones que vinieron col preséu.</string>
+    <string name="sim_missing_summary" product="default">Nun se detectó nenguna tarxeta SIM nel teléfonu. Pa inxertar una, llei les instrucciones que vinieron col preséu.</string>
+    <string name="date_time_summary">Si ye preciso, afita\'l to fusu horariu y configura la data y la hora actuales</string>
+    <string name="other_services_summary">Estos servicios faen que les funciones de Google funcionen y pues des/activalos en cualesquier momentu. Los datos úsense d\'acuerdu cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
+    <string name="location_services_summary">Los servicios de llocalización permiten que\'l sistema y les aplicaciones de terceros recueyan y usen datos, como los de la llocalización aproximada. Por exemplu, una aplicación pue usar la llocalización aproximada p\'atopar cafeteríes cercanes.</string>
+    <string name="location_access_summary"><b>Permitir que les aplicaciones que pidieren el to permisu</b> usen la información de la llocalización. Esta opción pue incluyir la llocalización actual y les anteriores.</string>
+    <string name="setup_mobile_data_emergency_only">Namás llamaes d\'emerxencia</string>
+    <string name="enable_mobile_data_summary">¿Quies usar los datos móviles na configuración? La so activación pue xenerar cargos.</string>
    <string name="no">Non</string>
    <string name="yes">Sí</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Llamada d\'emerxencia</string>
-    <string name="setup_services">Carauterístiques de LineageOS</string>
-    <string name="services_explanation" product="tablet">Esto servicios furrulen por ti pa estender les capacidaes de la to tableta. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_explanation" product="default">Esto servicios furrulen por ti pa estender les capacidaes del to teléfonu. Los datos usaránse acordies cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
+    <string name="setup_services">Funciones de LineageOS</string>
+    <string name="services_explanation" product="tablet">Estos servicios funcionen p\'aumentar les funciones de la tableta. Los datos úsense d\'acuerdu cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
+    <string name="services_explanation" product="default">Estos servicios funcionen p\'aumentar les funciones del teléfonu. Los datos úsense d\'acuerdu cola <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
    <string name="services_privacy_policy">Política de privacidá</string>
-    <string name="services_help_improve_cm">Ayuda a ameyorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> unviando diagnósticos y datos d\'usu de mou automáticu a LineageOS. Esta información nun pue usase pa identificate y écha-yos un gabitu a los equipos que trabayen en coses como la duración de la batería, el rindimientu d\'aplicaciones y les carauterístiques nueves de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
-    <string name="services_os_nav_keys_label"><b>Usar tecles de navegación na pantalla</b> en cuantes de tecles físiques.</string>
-    <string name="setup_unlock">Desbloquiar</string>
-    <string name="setup_device_locked">Esti preséu ta bloquiáu pol usuariu.</string>
-    <string name="setup_require_cyanogen_label"><b>Riquir la contraseña de la to cuenta</b> pa usar el to preséu incluso dempués de reafitalu.</string>
-    <string name="setup_device_locked_instructions"><i>Pa apagar/prender esta carauterística, por favor vete a Axustes &gt; Seguranza</i></string>
-    <string name="settings_fingerprint_setup_title">Esbilla\'l tipu de copia de seguranza de pantalla de bloquéu</string>
-    <string name="settings_fingerprint_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
-    <string name="fingerprint_setup_title">Configuración de buelga</string>
-    <string name="fingerprint_setup_summary">Pa usar el to sensor de buelgues pa desbloquiar la to pantalla, necesitarás:</string>
-    <string name="fingerprint_setup_backup_lock_method">Configura un métodu secundariu de desbloquéu</string>
+    <string name="services_help_improve_cm">Ayudar a ameyorar <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> pente l\'unviu los datos de diagnósticu y d\'usu a LineageOS. Esta información nun se pue usar pa identificate mas val p\'agabitar a los desendolcadores pa que trabayen en coses como la duración de la batería, el rindimientu de les aplicaciones y les funciones nueves de <xliff:g id="name" example="LineageOS">%2$s</xliff:g></string>
+    <string name="setup_device_locked">L\'usuariu bloquió esti preséu</string>
+    <string name="setup_device_locked_instructions"><i>Pa des/activar esta función, vete a Configuración &gt; Seguranza</i></string>
+    <string name="settings_biometric_setup_details">¿Cómo quies bloquiar la pantalla?</string>
+    <string name="fingerprint_setup_title">Configuración de buelgues</string>
+    <string name="fingerprint_setup_summary">Pa usar el sensor de buelgues y desbloquiar la pantalla:</string>
    <string name="fingerprint_setup_add_fingerprint">Amiesta la to buelga</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configuración del bloquéu de pantalla</string>
-    <string name="sim_locale_changed">%1$s SIM deteutada</string>
-    <string name="settings_lockscreen_setup_title">Esbillar triba de pantalla de blouquéu</string>
-    <string name="settings_lockscreen_setup_details">¿Cómo te prestaría bloquiar la to pantalla?</string>
-    <string name="lockscreen_setup_title" product="default">Protexi\'l to teléfonu</string>
-    <string name="lockscreen_setup_summary"><b>Protexe esti preséu</b> y riquirá un PIN, patrón o contraseña pa desbloquiar la pantalla</string>
+    <string name="face_setup_title">Configuración facial</string>
+    <string name="face_setup_summary">Pa usar la cara y desbloquiar la pantalla:</string>
+    <string name="face_setup_add_face">Amiesta la to cara</string>
+    <string name="biometric_setup_backup_lock_method">Configura un métodu secundariu de desbloquéu</string>
+    <string name="sim_locale_changed">Detectóse la locale «%1$s» de la SIM</string>
+    <string name="settings_lockscreen_setup_details">¿Cómo quies bloquiar la pantalla?</string>
+    <string name="lockscreen_setup_title" product="tablet">Proteición de la tableta</string>
+    <string name="lockscreen_setup_title" product="default">Proteición del teléfonu</string>
+    <string name="lockscreen_setup_summary"><b>Protexi esti preséu</b> y riqui un PIN, una contraseña o un patrón pa desbloquiar la pantalla</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
+    <string name="intro_restore_title">Restauración d\'aplicaciones y datos</string>
+    <string name="intro_restore_subtitle" product="tablet">Si tienes dalguna copia de seguranza de LineageOS pa la tableta, pues restaurala equí.</string>
+    <string name="intro_restore_subtitle" product="default">Si tienes dalguna copia de seguranza de LineageOS pal teléfonu, pues restaurala equí.</string>
 </resources>
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -28,7 +28,7 @@
    <string name="setup_locale">Dil</string>
    <string name="setup_wifi">Wi-Fi seçin</string>
    <string name="setup_sim_missing">SIM kart yoxdur</string>
-    <string name="setup_choose_data_sim">Verilənlər üçün bir SIM seçin</string>
+    <string name="setup_choose_data_sim">İnternet üçün bir SIM seçin</string>
    <string name="setup_location">Yerləşmə xidmətləri</string>
    <string name="setup_other">Digər xidmətlər</string>
    <string name="setup_datetime">Tarix &amp; vaxt</string>
@@ -36,44 +36,51 @@
    <string name="setup_current_time">Hazırki vaxt</string>
    <string name="sim_missing_summary" product="tablet">Planşetinizdə SIM kart aşkarlanmadı. SIM kart taxmaq üçün cihazınızla birgə gələn təlimatları oxuyun.</string>
    <string name="sim_missing_summary" product="default">Telefonunuzda SIM kart aşkarlanmadı. SIM kart taxmaq üçün cihazınızla birgə gələn təlimatları oxuyun.</string>
-    <string name="choose_data_sim_summary" product="tablet">Hansı SIM-i verilənlər üçün istifadə etmək istəyirsiz? Şəbəkə planşetinizin quraşdırılması üçün seçilən SIM-ə görə ödəniş tətbiq edə bilər.</string>
-    <string name="choose_data_sim_summary" product="default">Hansı SIM-i verilənlər üçün istifadə etmək istəyirsiz? Şəbəkə telefonunuzun quraşdırılması üçün seçilən SIM-ə görə ödəniş tətbiq edə bilər.</string>
-    <string name="date_time_summary">Saat qurşağınızı seçin və lazım olsa hazırki tarix və saatı tənzimləyin</string>
-    <string name="backup_data_summary">Tətbiqetmə verilənlərini, Wi-Fi şifrələri və digər tənzimləmələri Google serverlərinə <b>nüsxələ</b></string>
-    <string name="other_services_summary">Bu xidmətlər ilə Google sizin üçün işləməyə başlayar və istədiyiniz vaxt açıb bağlaya bilərsiniz. Verilənlər Google-un <xliff:g id="name" example="Privacy Policy">%s</xliff:g>nə uyğun olaraq istifadə ediləcək.</string>
-    <string name="location_services_summary">Yerləşmə xidmətləri sistem və üçüncü tərəf tətbiqetmələrə təxmini yeriniz kimi veriənləri götürmək və istifadə etmək icazəsi verər. Məsələn, bir tətbiqetmə yaxınlıqdakı əyləncə mərkəzini tapmaq üçün təxmini yerləşmənizdən istifadə edə bilər.</string>
-    <string name="location_access_summary"><b>Yer məlumatlarınızı istəyən tətbiqetmələrə icazə ver.</b> Bu hazırki və keçmiş yerləşmənizi ehtiva edə bilər.</string>
-    <string name="setup_mobile_data">Hüceyrəvi verilənləri işə sal</string>
+    <string name="choose_data_sim_summary" product="tablet">Hansı SIM-i internet üçün istifadə etmək istəyirsiz? Şəbəkə planşetinizin quraşdırılması üçün seçilən SIM-ə görə ödəniş tətbiq edə bilər.</string>
+    <string name="choose_data_sim_summary" product="default">Hansı SIM-i internet üçün istifadə etmək istəyirsiz? Şəbəkə telefonunuzun quraşdırılması üçün seçilən SIM-ə görə ödəniş tətbiq edə bilər.</string>
+    <string name="date_time_summary">Saat qurşağınızı seçin və lazım olsa hazırkı tarix və saatı ayarlayın</string>
+    <string name="backup_data_summary">Tətbiq datasını, Wi-Fi parollarını və digər ayarları Google serverlərinə <b>nüsxələyin</b></string>
+    <string name="other_services_summary">Bu xidmətlər ilə Google sizin üçün işləməyə başlayır və istədiyiniz vaxt açıb bağlaya bilərsiniz. Datalar, Google-un <xliff:g id="name" example="Privacy Policy">%s</xliff:g>nə uyğun olaraq istifadə ediləcək.</string>
+    <string name="location_services_summary">Yerləşmə xidmətləri, sistem və üçüncü tərəf tətbiqlərinə təxmini yerləşməniz kimi dataları yığmaq və istifadə etmək icazəsi verir. Məsələn, bir tətbiq yaxınlıqdakı əyləncə mərkəzini tapmaq üçün təxmini yerinizi istifadə edə bilər.</string>
+    <string name="location_access_summary"><b>Yer məlumatlarınızı istəyən tətbiqlərə icazə verin.</b> Bu hazırki və keçmiş yerləşmənizi ehtiva edə bilər.</string>
+    <string name="setup_mobile_data">Mobil interneti aç</string>
    <string name="setup_mobile_data_no_service">Xidmət yoxdur</string>
-    <string name="setup_mobile_data_emergency_only">Yalnız fövqəladə vəziyyət zəngləri</string>
-    <string name="enable_mobile_data_summary">Quraşdırma vaxtı hüceyrəvi verilənlərdən istifadə etmək istəyirsiniz? Hüceyrəvi verilənləri işə salmaq əlavə xərclərə səbəb ola bilər.</string>
+    <string name="setup_mobile_data_emergency_only">Yalnız fövqəladə hal zəngləri</string>
+    <string name="enable_mobile_data_summary">Quraşdırma vaxtı mobil interneti istifadə etmək istəyirsiniz? Mobil interneti açmaq əlavə xərclərə səbəb ola bilər.</string>
    <string name="no">Xeyr</string>
    <string name="yes">Bəli</string>
    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
-    <string name="emergency_call">Fövqəladə vəziyyət zəngləri</string>
+    <string name="emergency_call">Fövqəladə hal zəngləri</string>
    <string name="setup_services">LineageOS özəllikləri</string>
-    <string name="services_explanation" product="tablet">Bu xidmətlər planşetinizin qabiliyyətlərini artırar. Verilənlər LineageOS<xliff:g id="name" example="Gizlilik Siyasəti">%s</xliff:g> şərtlərinə uyğun olaraq istifadə ediləcək.</string>
-    <string name="services_explanation" product="default">Bu xidmətlər telefonunuzun qabiliyyətlərini artırar. Verilənlər LineageOS<xliff:g id="name" example="Gizlilik Siyasəti">%s</xliff:g> şərtlərinə uyğun olaraq istifadə ediləcək.</string>
+    <string name="services_explanation" product="tablet">Bu xidmətlər planşetinizin qabiliyyətlərini artırır. Datalar, LineageOS<xliff:g id="name" example="Gizlilik Siyasəti">%s</xliff:g> şərtlərinə uyğun olaraq istifadə ediləcək.</string>
+    <string name="services_explanation" product="default">Bu xidmətlər telefonunuzun qabiliyyətlərini artırır. Datalar, LineageOS<xliff:g id="name" example="Gizlilik Siyasəti">%s</xliff:g> şərtlərinə uyğun olaraq istifadə ediləcək.</string>
    <string name="services_privacy_policy">Gizlilik Siyasəti</string>
    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g>u təkmilləşdirməyə kömək edin</string>
-    <string name="services_metrics_label">LineageOS-a diaqnostikanı və istifadə verilənlərini avtomatik göndərərək <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu məlumatlarda kimliyiniz istifadə edilmir və batereya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%2$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edər.</string>
+    <string name="services_metrics_label">LineageOS-a diaqnostikanı və istifadə datasını avtomatik göndərərək <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu məlumatlarda kimliyiniz istifadə edilmir və batereya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%2$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edər.</string>
    <string name="services_os_nav_keys_label"><b>Avadanlıq düymələri əvəzinə ekran üstü hərəkət düymələrindən istifadə edin.</b></string>
    <string name="setup_unlock">Kilidi aç</string>
    <string name="setup_device_locked">Bu cihaz istifadəçisi tərəfindən kilidlənib.</string>
-    <string name="setup_require_cyanogen_label"><b>Hesab şifrəniz</b> cihazınızı sıfırladıqdan sonra istifadə edə bilmək üçün lazımdır.</string>
-    <string name="setup_device_locked_instructions"><i>Bu özəlliyi açıb bağlamaq üçün, zəhmət olmasa Tənzimləmələr &gt; Təhlükəsizlik bölməsinə gedin</i></string>
-    <string name="settings_fingerprint_setup_title">Ehtiyat ekran kilidi növünü seçin</string>
-    <string name="settings_fingerprint_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
+    <string name="setup_require_cyanogen_label"><b>Hesab parolunuz</b> cihazınızı sıfırladıqdan sonra istifadə edə bilmək üçün lazımdır.</string>
+    <string name="setup_device_locked_instructions"><i>Bu özəlliyi açıb bağlamaq üçün, lütfən Ayarlar &gt; Güvənlik bölməsinə gedin</i></string>
+    <string name="settings_biometric_setup_title">Ehtiyat ekran kilidi növünü seçin</string>
+    <string name="settings_biometric_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
    <string name="fingerprint_setup_title">Barmaq izi quraşdırma</string>
    <string name="fingerprint_setup_summary">Ekran kilidini açmaq üçün barmaq izi sensorunuzun istifadəsi üçün:</string>
-    <string name="fingerprint_setup_backup_lock_method">İkinci kilid açma üsulunu quraşdırın</string>
    <string name="fingerprint_setup_add_fingerprint">Barmaq izinizi əlavə edin</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ekran kilidi qurun</string>
+    <string name="face_setup_title">Üz quraşdırma</string>
+    <string name="face_setup_summary">Ekran kilidini açmaq üçün üzün istifadəsi üçün:</string>
+    <string name="face_setup_add_face">Üzünüzü əlavə edin</string>
+    <string name="biometric_setup_backup_lock_method">İkinci kilid açma üsulunu quraşdırın</string>
+    <string name="biometric_setup_screen_lock_setup">Ekran kilidi qurun</string>
    <string name="sim_locale_changed">%1$s SIM aşkarlandı</string>
    <string name="settings_lockscreen_setup_title">Ekran kilid növünü seçin</string>
    <string name="settings_lockscreen_setup_details">Ekranınızı necə kilidləmək istərdiniz?</string>
    <string name="lockscreen_setup_title" product="tablet">Planşetinizi qoruyun</string>
    <string name="lockscreen_setup_title" product="default">Telefonunuzu qoruyun</string>
-    <string name="lockscreen_setup_summary"><b>Bu cihazı qoruyun</b> və ekran kilidini açmaq üçün PIN, forma və ya şifrəni tələb edin</string>
+    <string name="lockscreen_setup_summary"><b>Bu cihazı qoruyun</b> və ekran kilidini açmaq üçün PIN, forma və ya parol tələb edin</string>
    <string name="lockscreen_setup_screen_lock_setup">Qur</string>
+    <string name="intro_restore_title">Tətbiqləri və datanı bərpa et</string>
+    <string name="intro_restore_subtitle" product="tablet">Son LineageOS planşetinizdən bir nüsxəniz varsa, burada bərpa edə bilərsiniz.</string>
+    <string name="intro_restore_subtitle" product="default">Son LineageOS telefonunuzdan bir nüsxəniz varsa, burada bərpa edə bilərsiniz.</string>
+    <string name="intro_restore_button">Nüsxədən bərpa et</string>
 </resources>
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -16,50 +16,40 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name">Майстар налады</string>
    <string name="next">Далей</string>
    <string name="skip">Прапусціць</string>
    <string name="start">Пачаць</string>
-    <string name="ok">Добра</string>
    <string name="loading">Секунду\u2026</string>
-    <string name="setup_complete">Налада завершана</string>
    <string name="setup_welcome">Вітаем</string>
+    <string name="setup_locale">Мова</string>
    <string name="setup_wifi">Выбраць сетку Wi-Fi</string>
-    <string name="setup_sim_missing">SIM-карта адсутнічае</string>
-    <string name="setup_choose_data_sim">Абярыце SIM-карту для перадачы дадзеных</string>
+    <string name="setup_sim_missing">SIM-картка адсутнічае</string>
+    <string name="setup_choose_data_sim">Выберыце SIM-картку для перадачы даных</string>
    <string name="setup_location">Службы месцазнаходжання</string>
-    <string name="setup_other">Іншыя службы</string>
    <string name="setup_datetime">Дата і час</string>
    <string name="setup_current_date">Бягучая дата</string>
    <string name="setup_current_time">Бягучы час</string>
-    <string name="sim_missing_summary" product="tablet">Не выяўлена ўсталяванай SIM-карты ў планшэце. Каб пазнаць, як уставіць SIM-карту, прачытайце інструкцыю да вашай прылады.</string>
-    <string name="sim_missing_summary" product="default">Не выяўлена ўсталяванай SIM-карты ў тэлефоне. Каб пазнаць, як уставіць SIM-карту, прачытайце інструкцыю да вашай прылады.</string>
-    <string name="choose_data_sim_summary" product="tablet">Якую SIM вы хочаце скарыстаць для перадачы дадзеных? Абраная SIM можа пацягнуць выдаткі, бо яна будзе выкарыстоўвацца для налады планшэта.</string>
-    <string name="choose_data_sim_summary" product="default">Якую SIM вы хочаце скарыстаць для перадачы дадзеных? Абраная SIM можа пацягнуць выдаткі, бо яна будзе выкарыстоўвацца для налады тэлефона.</string>
-    <string name="date_time_summary">Усталюйце свой часавы пояс і наладзьце бягучую дату і час, калі трэба</string>
-    <string name="backup_data_summary"><b>Захоўваць</b> дадзеныя дадаткаў, паролі Wi-Fi і іншыя параметры на сервера Google</string>
-    <string name="other_services_summary">Гэтыя службы дазваляюць Google пашырыць магчымасці прылады. Вы можаце выключыць іх у кожны час. Дадзеныя будуць выкарыстоўвацца ў адпаведнасці з <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Службы месцазнаходжання дазваляюць сістэме і ўсталяваным дадаткам збіраць і скарыстаць такія дадзеныя, як ваша прыблізнае месцазнаходжанне. Прыкладам, дадатак можа шукаць кавярні паблізу, засноўваючыся на дадзеных пра ваша месцазнаходжанне.</string>
-    <string name="location_access_summary"><b>Дазволіць дадаткам, якія запыталі ваш дазвол</b> скарыстаць інфармацыю пра ваша месцазнаходжанне. Гэта можа ўлучаць ваша бягучае і мінулыя месцазнаходжанні.</string>
-    <string name="setup_mobile_data">Падлучыць мабільны трафік</string>
+    <string name="backup_data_summary"><b>Рабіць рэзервовую копію</b> даных праграмы, пароляў Wi-Fi і іншых наладаў на серверах Google</string>
+    <string name="location_services_summary">Службы вызначэння месцазнаходжання дазваляюць сістэмным і староннім праграмам збіраць і выкарыстоўваць такія даныя, як ваша прыблізнае месцазнаходжанне. Напрыклад, праграма можа выкарыстоўваць ваша прыблізнае месцазнаходжанне, каб знайсці бліжэйшыя кавярні.</string>
+    <string name="location_access_summary"><b>Дазволіць праграмам, якія запыталі ваш дазвол</b> выкарыстоўваць інфармацыю вашага месцазнаходжання. Гэта можа ўключаць ваша бягучыя і папярэднія месцазнаходжанні.</string>
+    <string name="setup_mobile_data">Уключыць мабільную перадачу даных</string>
    <string name="setup_mobile_data_no_service">Няма сеткі</string>
-    <string name="setup_mobile_data_emergency_only">Толькі экстраныя выклікі</string>
-    <string name="enable_mobile_data_summary">Выкарыстоўваць мабільную сувязь падчас налады? Ўключэнне перадачы дадзеных па сотавых сетках можа пацягнуць выдаткі.</string>
+    <string name="setup_mobile_data_emergency_only">Толькі экстранныя выклікі</string>
+    <string name="enable_mobile_data_summary">Вы сапраўды хочаце выкарыстоўваць перадачу даных праз сотавую сетку падчас наладжвання? Уключэнне перадачы даных праз сотавую сетку можа стаць прычынай дадатковай платы.</string>
    <string name="no">Не</string>
    <string name="yes">Так</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Экстранны выклік</string>
-    <string name="services_privacy_policy">Палітыка прыватнасці</string>
-    <string name="services_os_nav_keys_label"><b>Скарыстаць на экранные навігацыйныя кнопкі</b> заміж апаратных.</string>
-    <string name="setup_unlock">Разблакаваць</string>
-    <string name="setup_device_locked">Прылада была заблакавана карыстальнікам.</string>
-    <string name="setup_device_locked_instructions"><i> Каб уключыць ці адключыць гэту функцыю, перайдзіце ў меню \"Налады\" &gt; \"Бяспека\"</i></string>
-    <string name="settings_fingerprint_setup_title">Выбраць рэзервовы спосаб блакавання экрана</string>
-    <string name="settings_fingerprint_setup_details">Абярыце спосаб блакавання экрана.</string>
-    <string name="fingerprint_setup_title">Налада адбіткаў пальцаў</string>
-    <string name="fingerprint_setup_summary">Каб скарыстаць сканар адбіткаў пальцаў для разблакоўкі экрана, трэба:</string>
-    <string name="fingerprint_setup_backup_lock_method">Наладзіць дадатковы спосаб разблакоўкі</string>
+    <string name="services_os_nav_keys_label"><b>Выкарыстоўваць кнопкі навігацыі на экране</b> замест апаратных.</string>
+    <string name="setup_device_locked_instructions"><i> Для адключэння або ўключэння гэтай функцыі, перайдзіце ў меню \"Налады\" &gt; \"Бяспека\"</i></string>
+    <string name="settings_biometric_setup_details">Выберыце спосаб блакіравання экрана.</string>
+    <string name="fingerprint_setup_title">Наладжванне адбітка пальца</string>
    <string name="fingerprint_setup_add_fingerprint">Дадаць адбітак пальца</string>
-    <string name="fingerprint_setup_screen_lock_setup">Наладзіць блакаванне экрану</string>
-    <string name="sim_locale_changed">%1$s SIM знойдзена</string>
-    <string name="settings_lockscreen_setup_details">Абярыце спосаб блакавання экрана.</string>
+    <string name="face_setup_title">Разблакіроўка па твары</string>
+    <string name="face_setup_add_face">Дадаць твар</string>
+    <string name="settings_lockscreen_setup_details">Выберыце спосаб блакіравання экрана.</string>
+    <string name="lockscreen_setup_title" product="tablet">Абараніце свой планшэт</string>
+    <string name="lockscreen_setup_title" product="default">Абараніце свой тэлефон</string>
+    <string name="lockscreen_setup_screen_lock_setup">Наладзіць</string>
+    <string name="intro_restore_title">Аднавіць праграмы і даныя</string>
 </resources>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Това устройство е заключено от потребителя.</string>
    <string name="setup_require_cyanogen_label"><b>Изисква паролата на акаунта</b> за да използвате устройството дори след фабрично нулиране.</string>
    <string name="setup_device_locked_instructions"><i>За да включите тази функция, изключено/включено, моля отидете на Настройки &gt; Сигурност</i></string>
-    <string name="settings_fingerprint_setup_title">Изберете резервен метод за заключване на екрана</string>
-    <string name="settings_fingerprint_setup_details">Как бихте желали да заключите вашият екран?</string>
+    <string name="settings_biometric_setup_title">Изберете резервен метод за заключване на екрана</string>
+    <string name="settings_biometric_setup_details">Как бихте желали да заключите вашият екран?</string>
    <string name="fingerprint_setup_title">Създаване на пръстов отпечатък</string>
    <string name="fingerprint_setup_summary">За да използвате сензора за пръстови отпечатъци за отключите вашият екран, ще трябва да:</string>
-    <string name="fingerprint_setup_backup_lock_method">Настройка на втори метод за отключване</string>
    <string name="fingerprint_setup_add_fingerprint">Добавете вашият пръстов отпечатък</string>
-    <string name="fingerprint_setup_screen_lock_setup">Настройка на екрана за заключване</string>
+    <string name="face_setup_title">Настройка на лицево отключване</string>
+    <string name="face_setup_summary">За да използвате лицеви данни, за отключване на екрана, ще трябва:</string>
+    <string name="face_setup_add_face">Добави лицеви данни</string>
+    <string name="biometric_setup_backup_lock_method">Настройка на втори метод за отключване</string>
+    <string name="biometric_setup_screen_lock_setup">Настройка на екрана за заключване</string>
    <string name="sim_locale_changed">Намерена %1$s СИМ карта</string>
    <string name="settings_lockscreen_setup_title">Изберете метод на заключване на екрана</string>
    <string name="settings_lockscreen_setup_details">Как бихте желали да заключите вашият екран?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Защитете телефона си</string>
    <string name="lockscreen_setup_summary"><b>Защитете у-вото</b> и изисквайте ПИН код, фигура или парола за отключване на екрана</string>
    <string name="lockscreen_setup_screen_lock_setup">Конфигуриране</string>
+    <string name="intro_restore_title">Възстановяване на приложения и данни</string>
+    <string name="intro_restore_subtitle" product="tablet">Ако имате резервно копие, направено на друг таблет с LineageOS, можете да го възстановите тук.</string>
+    <string name="intro_restore_subtitle" product="default">Ако имате резервно копие, направено на друг телефон с LineageOS, можете да го възстановите тук.</string>
+    <string name="intro_restore_button">Възстановяване от архив</string>
 </resources>
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">সংস্থাপন উইজার্ড</string>
+    <string name="next">পরবর্তী</string>
+    <string name="skip">এড়িয়ে যান</string>
+    <string name="start">শুরু</string>
+    <string name="done">সম্পন্ন</string>
+    <string name="ok">ঠিক আছে</string>
+    <string name="loading">মাত্র কয়েক মুহূর্ত\u2026</string>
+    <string name="setup_welcome">স্বাগতম</string>
+    <string name="setup_locale">ভাষা</string>
+    <string name="setup_wifi">Wi-Fi নির্বাচন করুন</string>
+    <string name="setup_location">অবস্থান পরিষেবা</string>
+    <string name="setup_other">অন্যান্য পরিষেবা</string>
+    <string name="setup_datetime">তারিখ &amp; সময়</string>
+    <string name="setup_current_date">বর্তমান তারিখ</string>
+    <string name="setup_current_time">বর্তমান সময়</string>
+    <string name="sim_missing_summary" product="tablet">আপনার ট্যাবলেটে সিমকার্ড অনুপস্থিত। সিমকার্ড ঢোকাতে, আপনার ডিভাইসের নির্দেশিকা পড়ুন।</string>
+    <string name="sim_missing_summary" product="default">আপনার ফোনে সিমকার্ড অনুপস্থিত। সিমকার্ড ঢোকাতে, আপনার ডিভাইসের নির্দেশিকা পড়ুন।</string>
+    <string name="choose_data_sim_summary" product="tablet">কোন সিম দিয়ে ডাটা ব্যবহার করতে চান? ট্যাবলেট সেটআপ করতে ডাটা ব্যবহারের কারণে নির্বাচিত সিমে মূল্য ব্যয় করা হতে পারে।</string>
+    <string name="choose_data_sim_summary" product="default">কোন সিম দিয়ে ডাটা ব্যবহার করতে চান? ফোন সেটআপ করতে ডাটা ব্যবহারের কারণে নির্বাচিত সিমে মূল্য ব্যয় করা হতে পারে।</string>
+    <string name="date_time_summary">আপনার সময় অঞ্চল নির্ধারণ করুন এবং প্রয়োজন হলে বর্তমান তারিখ এবং সময় ঠিক করুন</string>
+    <string name="backup_data_summary">অ্যাপের তথ্য, ওয়াই-ফাই পাসওয়ার্ড এবং অন্যান্য নিয়ন্ত্রণ গুগল সার্ভারে <b>ব্যাক আপ</b></string>
+    <string name="setup_mobile_data">সেলুলার ডাটা চালু করুন</string>
+    <string name="setup_mobile_data_no_service">কোনো পরিষেবা নেই</string>
+    <string name="setup_mobile_data_emergency_only">শুধুমাত্র জরুরী কল</string>
+    <string name="enable_mobile_data_summary">প্রথমবার প্রস্তুত করার সময় আপনি কি সেলুলার ডাটা ব্যবহার করতে চান? সেলুলার ডাটা চালু করলে মূল্য দিতে হতে পারে।</string>
+    <string name="no">না</string>
+    <string name="yes">হ্যাঁ</string>
+    <string name="data_sim_name">সিম <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">জরুরী কল</string>
+    <string name="setup_services">LineageOS এর বৈশিষ্ট্যসমূহ</string>
+    <string name="services_explanation" product="tablet">এই সেবা আপনার ট্যাবলেটের ক্ষমতা বাড়াতে কাজ করে। LineageOS\'র অনুসারে তথ্য ব্যবহার করা হবে<xliff:g id="name" example="Privacy Policy">%s </xliff:g>।</string>
+    <string name="services_explanation" product="default">এই সেবা আপনার ফোনের ক্ষমতা বাড়াতে কাজ করে। LineageOS\'র অনুসারে তথ্য ব্যবহার করা হবে<xliff:g id="name" example="Privacy Policy">%s </xliff:g>।</string>
+    <string name="services_privacy_policy">গোপনীয়তার নীতি</string>
+    <string name="setup_unlock">আনলক</string>
+    <string name="setup_require_cyanogen_label"><b>আপনার হিসাবের পাসওয়ার্ড প্রয়োজন</b> যাতে ফ্যাক্টরি রিসেট করার পরেেও আপনার ডিভাইসে ব্যবহার করতে পারেন।</string>
+    <string name="lockscreen_setup_screen_lock_setup">সেট আপ করুন</string>
+</resources>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Aquest dispositiu ha estat bloquejat per l\'usuari.</string>
    <string name="setup_require_cyanogen_label"><b>Demana la teva contrasenya del compte</b> per utilitzar el teu dispositiu, fins i tot després de restablir les configuracions de fàbrica.</string>
    <string name="setup_device_locked_instructions"><i>Per activar/desactivar aquesta característica, si us plau ves a Configuració &gt; Seguretat</i></string>
-    <string name="settings_fingerprint_setup_title">Selecciona el tipus de bloqueig de pantalla de reserva</string>
-    <string name="settings_fingerprint_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
+    <string name="settings_biometric_setup_title">Selecciona el tipus de bloqueig de pantalla de reserva</string>
+    <string name="settings_biometric_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
    <string name="fingerprint_setup_title">Configuració de l\'empremta digital</string>
    <string name="fingerprint_setup_summary">Per utilitzar el teu sensor d\'empremtes digitals per desbloquejar la pantalla, hauràs de:</string>
-    <string name="fingerprint_setup_backup_lock_method">Configura el mètode de desbloqueig alternatiu</string>
    <string name="fingerprint_setup_add_fingerprint">Afegeix la teva empremta digital</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
+    <string name="face_setup_title">Configuració facial</string>
+    <string name="face_setup_summary">Per utilitzar la cara per desbloquejar la pantalla, haureu de:</string>
+    <string name="face_setup_add_face">Afegiu la vostra cara</string>
+    <string name="biometric_setup_backup_lock_method">Configura el mètode de desbloqueig alternatiu</string>
+    <string name="biometric_setup_screen_lock_setup">Configuració del bloqueig de pantalla</string>
    <string name="sim_locale_changed">%1$s SIM detectada</string>
    <string name="settings_lockscreen_setup_title">Selecciona el tipus de bloqueig de pantalla</string>
    <string name="settings_lockscreen_setup_details">Com t\'agradaria bloquejar la teva pantalla?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protegeix el teu telèfon</string>
    <string name="lockscreen_setup_summary"><b>Protegeix el dispositiu</b> i estableix un PIN, un patró o una contrasenya per desbloquejar la pantalla</string>
    <string name="lockscreen_setup_screen_lock_setup">Configura</string>
+    <string name="intro_restore_title">Restauració d\'aplicacions i dades</string>
+    <string name="intro_restore_subtitle" product="tablet">Si teniu una còpia de seguretat de la vostra última tauleta LineageOS, podeu restaurar-la aquí.</string>
+    <string name="intro_restore_subtitle" product="default">Si teniu una còpia de seguretat de la vostra últim telèfon LineageOS, podeu restaurar-la aquí.</string>
+    <string name="intro_restore_button">Restaura des de la còpia de seguretat</string>
 </resources>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Toto zařízení bylo uzamčeno uživatelem.</string>
    <string name="setup_require_cyanogen_label">Po obnovení továrního nastavení bude <b>vyžadováno heslo k Vašemu účtu</b>.</string>
    <string name="setup_device_locked_instructions"><i>Pro zapnutí/vypnutí této funkce, přejděte do nastavení &gt; Zabezpečení</i></string>
-    <string name="settings_fingerprint_setup_title">Vyberte záložní typ zámku obrazovky</string>
-    <string name="settings_fingerprint_setup_details">Jak chcete zamykat obrazovku?</string>
+    <string name="settings_biometric_setup_title">Vyberte záložní typ zámku obrazovky</string>
+    <string name="settings_biometric_setup_details">Jak chcete zamykat obrazovku?</string>
    <string name="fingerprint_setup_title">Nastavení otisku prstu</string>
    <string name="fingerprint_setup_summary">Chcete-li použít snímač otisků prstů pro odemknutí obrazovky, budete potřeba:</string>
-    <string name="fingerprint_setup_backup_lock_method">Nastavení alternativní metody odemčení</string>
    <string name="fingerprint_setup_add_fingerprint">Přidat otisk prstu</string>
-    <string name="fingerprint_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
+    <string name="face_setup_title">Nastavení obličeje</string>
+    <string name="face_setup_summary">Chcete‑li k\u00a0odemknutí obrazovky použít obličej, budete muset:</string>
+    <string name="face_setup_add_face">Přidat svůj obličej</string>
+    <string name="biometric_setup_backup_lock_method">Nastavení alternativní metody odemčení</string>
+    <string name="biometric_setup_screen_lock_setup">Nastavit zámek obrazovky</string>
    <string name="sim_locale_changed">Zjištěna %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
    <string name="settings_lockscreen_setup_details">Jak chcete zamykat obrazovku?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Chraňte svůj telefon</string>
    <string name="lockscreen_setup_summary"><b>Chránit toto zařízení</b> a před odemknutím obrazovky požadovat kód PIN, gesto nebo heslo</string>
    <string name="lockscreen_setup_screen_lock_setup">Nastavit</string>
+    <string name="intro_restore_title">Obnovit aplikace a\u00a0data</string>
+    <string name="intro_restore_subtitle" product="tablet">Pokud máte zálohu z\u00a0vašeho posledního tabletu s\u00a0LineageOS, můžete ji obnovit zde.</string>
+    <string name="intro_restore_subtitle" product="default">Pokud máte zálohu z\u00a0vašeho posledního telefonu s\u00a0LineageOS, můžete ji obnovit zde.</string>
+    <string name="intro_restore_button">Obnovit ze zálohy</string>
 </resources>
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Mae\'r ddyfais hon wedi ei chloi gan y defnyddiwr.</string>
    <string name="setup_require_cyanogen_label"><b>Mynna bod angen cyfrinair dy gyfrif</b> er mwyn medru defnyddio\'r ddyfais, hyd yn oed os yw\'n cael ei ailosod i fel yr oedd yn gadael y ffatri.</string>
    <string name="setup_device_locked_instructions"><i>I droi\'r nodwedd hon ymlaen/i ffwrdd, edrycha yn Gosodiadau &gt; Diogelwch</i></string>
-    <string name="settings_fingerprint_setup_title">Dewis math o glo sgrin wrth gefn</string>
-    <string name="settings_fingerprint_setup_details">Sut hoffet gloi dy sgrin?</string>
+    <string name="settings_biometric_setup_title">Dewis math o glo sgrin wrth gefn</string>
+    <string name="settings_biometric_setup_details">Sut hoffet gloi dy sgrin?</string>
    <string name="fingerprint_setup_title">Gosod ôl bys</string>
    <string name="fingerprint_setup_summary">I ddefnyddio\'r synhwyrydd olion bysedd i ddatgloi dy sgrin, mae angen:</string>
-    <string name="fingerprint_setup_backup_lock_method">Gosod ail ddull o ddatgloi</string>
    <string name="fingerprint_setup_add_fingerprint">Ychwanegu ôl dy fys</string>
-    <string name="fingerprint_setup_screen_lock_setup">Gosod clo\'r sgrin</string>
+    <string name="face_setup_title">Gosod wyneb</string>
+    <string name="face_setup_summary">I ddefnyddio dy wyneb i ddatgloi dy sgrin, bydd angen i ti:</string>
+    <string name="face_setup_add_face">Ychwanegu dy wyneb</string>
+    <string name="biometric_setup_backup_lock_method">Gosod ail ddull o ddatgloi</string>
+    <string name="biometric_setup_screen_lock_setup">Gosod clo\'r sgrin</string>
    <string name="sim_locale_changed">Synhwyrwyd %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Dewis math o sgrin cloi</string>
    <string name="settings_lockscreen_setup_details">Sut hoffet gloi dy sgrin?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Diogelu dy ffôn</string>
    <string name="lockscreen_setup_summary"><b>Diogela\'r ddyfais hon</b> gan osod PIN, patrwm, neu gyfrinair er mwyn datgloi\'r sgrin.</string>
    <string name="lockscreen_setup_screen_lock_setup">Gosod</string>
+    <string name="intro_restore_title">Adfer apiau a data</string>
+    <string name="intro_restore_subtitle" product="tablet">Os oes gennyt gopi data wrth gefn o dy lechen LineageOS diwethaf, gellir ei adfer yma.</string>
+    <string name="intro_restore_subtitle" product="default">Os oes gennyt gopi data wrth gefn o dy ffôn LineageOS diwethaf, gellir ei adfer yma.</string>
+    <string name="intro_restore_button">Adfer o gopi wrth gefn</string>
 </resources>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -23,6 +23,7 @@
    <string name="done">Færdig</string>
    <string name="ok">OK</string>
    <string name="loading">Lige et øjeblik\u2026</string>
+    <string name="setup_complete">Opsætning er fuldført</string>
    <string name="setup_welcome">Velkommen</string>
    <string name="setup_locale">Sprog</string>
    <string name="setup_wifi">Vælg Wi-Fi</string>
@@ -42,7 +43,7 @@
    <string name="other_services_summary">Disse tjenester sætter Google til at arbejde for dig, og du kan slå dem til eller fra, når som helst. Data vil blive anvendt i overensstemmelse med Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
    <string name="location_services_summary">Lokalitetstjenester tillader system og tredjeparts-apps at indsamle og bruge data, så som din omtrentlige lokalitet. For eksempel, kan en app bruge din omtrentlige lokalitet til at finde nærliggende kaffebarer.</string>
    <string name="location_access_summary"><b>Tillad apps, der har bedt om din tilladelse</b> at bruge din lokalitetsinformation. Dette kan inkludere din aktuelle lokalitet og tidligere lokaliteter.</string>
-    <string name="setup_mobile_data">Tænd mobildata</string>
+    <string name="setup_mobile_data">Tænd for mobildata</string>
    <string name="setup_mobile_data_no_service">Ingen tjeneste</string>
    <string name="setup_mobile_data_emergency_only">Kun nødopkald</string>
    <string name="enable_mobile_data_summary">Vil du bruge mobildata under opsætning? Aktivering af mobildata kan medføre dataudgifter.</string>
@@ -60,11 +61,13 @@
    <string name="setup_device_locked">Denne enhed er blevet låst af brugeren.</string>
    <string name="setup_require_cyanogen_label"><b>Kræver adgangskoden til din konto</b> for at bruge enheden, selv efter en nulstilling til fabriksindstillinger.</string>
    <string name="setup_device_locked_instructions"><i>Gå til Indstillinger &gt; Sikkerhed, for at slå denne funktion fra/til</i></string>
-    <string name="settings_fingerprint_setup_title">Vælg sikkerheds-låseskærmtype</string>
-    <string name="settings_fingerprint_setup_details">Hvordan vil du låse din skærm?</string>
+    <string name="settings_biometric_setup_title">Vælg sikkerheds-låseskærmtype</string>
+    <string name="settings_biometric_setup_details">Hvordan vil du låse din skærm?</string>
    <string name="fingerprint_setup_title">Fingeraftryksopsætning</string>
    <string name="fingerprint_setup_summary">For at bruge din fingeraftryks-sensor til at låse din skærm op, er du nødt til at:</string>
-    <string name="fingerprint_setup_backup_lock_method">Indstil en sekundær oplåsningsmetode</string>
+    <string name="fingerprint_setup_add_fingerprint">Tilføj dit fingeraftryk</string>
+    <string name="biometric_setup_backup_lock_method">Indstil en sekundær oplåsningsmetode</string>
+    <string name="biometric_setup_screen_lock_setup">Indstil skærmlås</string>
    <string name="sim_locale_changed">%1$s SIM fundet</string>
    <string name="settings_lockscreen_setup_title">Vælg skærmlåstype</string>
    <string name="settings_lockscreen_setup_details">Hvordan vil du låse din skærm?</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -34,46 +34,53 @@
    <string name="setup_datetime">Datum und Uhrzeit</string>
    <string name="setup_current_date">Aktuelles Datum</string>
    <string name="setup_current_time">Aktuelle Zeit</string>
-    <string name="sim_missing_summary" product="tablet">Es wurde keine SIM-Karte in Ihrem Smartphone erkannt. Wie Sie eine SIM-Karte einlegen, können Sie in der Bedienungsanleitung zu Ihrem Tablet nachlesen.</string>
-    <string name="sim_missing_summary" product="default">Es wurde keine SIM-Karte in Ihrem Smartphone erkannt. Wie Sie eine SIM-Karte einlegen, können Sie in der Bedienungsanleitung zu Ihrem Gerät nachlesen.</string>
-    <string name="choose_data_sim_summary" product="tablet">Welche SIM-Karte soll für Daten verwendet werden? Da die ausgewählte SIM-Karte bei der Einrichtung des Tablets verwendet wird, können für Sie Kosten anfallen.</string>
-    <string name="choose_data_sim_summary" product="default">Welche SIM-Karte soll für Daten verwendet werden? Da die ausgewählte SIM-Karte bei der Einrichtung des Smartphones verwendet wird, können für Sie Kosten anfallen.</string>
+    <string name="sim_missing_summary" product="tablet">Es wurde keine SIM-Karte in deinem Tablet erkannt. Wie du eine SIM-Karte einlegst, kannst du in der Bedienungsanleitung deines Tablets nachlesen.</string>
+    <string name="sim_missing_summary" product="default">Es wurde keine SIM-Karte in deinem Telefon erkannt. Wie du eine SIM-Karte einlegst, kannst du in der Bedienungsanleitung des Telefons nachlesen.</string>
+    <string name="choose_data_sim_summary" product="tablet">Welche SIM-Karte soll für Daten verwendet werden? Da die ausgewählte SIM-Karte bei der Einrichtung des Tablets verwendet wird, können Kosten für dich anfallen.</string>
+    <string name="choose_data_sim_summary" product="default">Welche SIM-Karte soll für Daten verwendet werden? Da die ausgewählte SIM-Karte bei der Einrichtung des Smartphones verwendet wird, können Kosten für dich anfallen.</string>
    <string name="date_time_summary">Zeitzone setzen und ggf. aktuelles Datum und Uhrzeit anpassen</string>
    <string name="backup_data_summary"><b>Sichert</b> App-Daten, WLAN-Passwörter und andere Einstellungen auf Google-Servern</string>
    <string name="other_services_summary">Diese Dienste werden von Google zur Verfügung gestellt und können jederzeit aktiviert oder deaktiviert werden. Die Daten werden in Übereinstimmung mit Googles <xliff:g id="name" example="Privacy Policy">%s</xliff:g> genutzt.</string>
-    <string name="location_services_summary">Standortdienste erlauben es Systemapps oder Apps von Drittanbietern, Daten (z. B. zu Ihrem ungefähren Standort) zu sammeln und zu verwenden. Beispielweise könnte eine App Ihren ungefähren Standort verwenden, um Cafés in der Nähe zu finden.</string>
-    <string name="location_access_summary"><b>Erlaubt Apps, die um Ihre Erlaubnis gebeten haben, </b>Ihre Standortinformationen zu verwenden. Dies können Informationen zu Ihrem aktuellen Standort und zu vergangenen Standorten sein.</string>
+    <string name="location_services_summary">Standortdienste erlauben es Systemapps oder Apps von Drittanbietern, Daten (z. B. zu deinem ungefähren Standort) zu sammeln und zu verwenden. Beispielweise könnte eine App deinen ungefähren Standort verwenden, um Cafés in der Nähe zu finden.</string>
+    <string name="location_access_summary"><b>Erlaubt Apps, die um deine Erlaubnis gebeten haben, </b>deine Standortinformationen zu verwenden. Dies können Informationen zu deinem aktuellen Standort und zu vergangenen Standorten sein.</string>
    <string name="setup_mobile_data">Mobile Datenverbindung aktivieren</string>
    <string name="setup_mobile_data_no_service">Kein Service</string>
    <string name="setup_mobile_data_emergency_only">Nur Notrufe</string>
-    <string name="enable_mobile_data_summary">Möchten Sie Datenverbindungen über das Mobilfunknetz aktivieren? Dies kann eventuell Kosten verursachen.</string>
+    <string name="enable_mobile_data_summary">Möchtest du Datenverbindungen über das Mobilfunknetz aktivieren? Dies kann eventuell Kosten verursachen.</string>
    <string name="no">Nein</string>
    <string name="yes">Ja</string>
    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Notruf</string>
    <string name="setup_services">LineageOS-Funktionen</string>
-    <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen Ihres Tablets zu erweitern. Ihre Daten werden in Übereinstimmung mit der <xliff:g id="name" example="Datenschutzerklärung">%s</xliff:g> von LineageOS verwendet.</string>
-    <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen Ihres Telefons zu erweitern. Ihre Daten werden in Übereinstimmung mit der <xliff:g id="name" example="Datenschutzerklärung">%s</xliff:g> von LineageOS verwendet.</string>
+    <string name="services_explanation" product="tablet">Diese Dienste werden verwendet, um die Funktionen deines Tablets zu erweitern. Deine Daten werden in Übereinstimmung mit der <xliff:g id="name" example="Datenschutzerklärung">%s</xliff:g> von LineageOS verwendet.</string>
+    <string name="services_explanation" product="default">Diese Dienste werden verwendet, um die Funktionen deines Telefons zu erweitern. Deine Daten werden in Übereinstimmung mit der <xliff:g id="name" example="Datenschutzerklärung">%s</xliff:g> von LineageOS verwendet.</string>
    <string name="services_privacy_policy">Datenschutzerklärung</string>
-    <string name="services_help_improve_cm">Helfen Sie <xliff:g id="name" example="LineageOS">%s</xliff:g> zu verbessern</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Helfen Sie LineageOS zu verbessern">%1$s</xliff:g>, indem Sie automatisch Diagnose-und Nutzungsdaten an LineageOS senden. Diese Informationen können nicht dazu verwendet werden, Sie zu identifizieren. Vielmehr helfen Sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-Funktionen.</string>
+    <string name="services_help_improve_cm">Hilf <xliff:g id="name" example="LineageOS">%s</xliff:g> zu verbessern</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Hilf LineageOS zu verbessern">%1$s</xliff:g>, indem du automatisch Diagnose- und Nutzungsdaten an LineageOS sendest. Diese Informationen können nicht dazu verwendet werden, dich zu identifizieren. Vielmehr helfen sie unserem Team bei der Arbeit an Dingen wie der Akkulaufzeit, der App-Leistung und <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-Funktionen.</string>
    <string name="services_os_nav_keys_label"><b>Bildschirm-Navigationstasten</b> statt Hardwaretasten verwenden.</string>
    <string name="setup_unlock">Entsperren</string>
    <string name="setup_device_locked">Dieses Gerät wurde vom Benutzer gesperrt.</string>
-    <string name="setup_require_cyanogen_label"><b>Ihr Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string>
-    <string name="setup_device_locked_instructions"><i>Um diese Funktion zu aktivieren/deaktivieren, gehen Sie zu Einstellungen &gt; Sicherheit.</i></string>
-    <string name="settings_fingerprint_setup_title">Wählen Sie den Typ der Ersatz-Bildschirmsperre.</string>
-    <string name="settings_fingerprint_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
+    <string name="setup_require_cyanogen_label"><b>Dein Konto-Passwort</b> wird auch nach einem Zurücksetzen auf Werkseinstellungen benötigt.</string>
+    <string name="setup_device_locked_instructions"><i>Um diese Funktion zu aktivieren/deaktivieren, gehe zu Einstellungen &gt; Sicherheit.</i></string>
+    <string name="settings_biometric_setup_title">Wähle den Typ der Ersatz-Bildschirmsperre.</string>
+    <string name="settings_biometric_setup_details">Wie möchtest du deinen Bildschirm sperren?</string>
    <string name="fingerprint_setup_title">Fingerabdruck einrichten</string>
-    <string name="fingerprint_setup_summary">Wenn Sie Ihren Fingerabdrucksensor zum Entsperren Ihres Bildschirms verwenden möchten, gehen Sie wie folgt vor:</string>
-    <string name="fingerprint_setup_backup_lock_method">Einrichtung einer sekundären Methode zum Entsperren</string>
-    <string name="fingerprint_setup_add_fingerprint">Fügen Sie Ihren Fingerabdruck hinzu.</string>
-    <string name="fingerprint_setup_screen_lock_setup">Die Bildschirmsperre einrichten</string>
+    <string name="fingerprint_setup_summary">Wenn du deinen Fingerabdrucksensor zum Entsperren deines Bildschirms verwenden möchtest, gehe wie folgt vor:</string>
+    <string name="fingerprint_setup_add_fingerprint">Füge deinen Fingerabdruck hinzu</string>
+    <string name="face_setup_title">Gesichtseinstellung</string>
+    <string name="face_setup_summary">Um dein Gesicht zum Entsperren des Bildschirms verwenden zu können, musst du folgendes tun:</string>
+    <string name="face_setup_add_face">Füge dein Gesicht hinzu</string>
+    <string name="biometric_setup_backup_lock_method">Einrichtung einer sekundären Methode zum Entsperren</string>
+    <string name="biometric_setup_screen_lock_setup">Bildschirmsperre einrichten</string>
    <string name="sim_locale_changed">%1$s SIM-Karte erkannt</string>
-    <string name="settings_lockscreen_setup_title">Wählen Sie einen Sperrbildschirm-Typ</string>
-    <string name="settings_lockscreen_setup_details">Wie möchten Sie Ihren Bildschirm sperren?</string>
-    <string name="lockscreen_setup_title" product="tablet">Schützen Sie Ihr Tablet</string>
-    <string name="lockscreen_setup_title" product="default">Schützen Sie Ihr Telefon</string>
+    <string name="settings_lockscreen_setup_title">Wähle einen Sperrbildschirm-Typ</string>
+    <string name="settings_lockscreen_setup_details">Wie möchtest du deinen Bildschirm sperren?</string>
+    <string name="lockscreen_setup_title" product="tablet">Schütze dein Tablet</string>
+    <string name="lockscreen_setup_title" product="default">Schütze dein Telefon</string>
    <string name="lockscreen_setup_summary"><b>Gerät schützen</b> und PIN, Muster oder Passwort zur Display-Entsperrung verwenden</string>
    <string name="lockscreen_setup_screen_lock_setup">Einrichten</string>
+    <string name="intro_restore_title">Apps und Daten wiederherstellen</string>
+    <string name="intro_restore_subtitle" product="tablet">Wenn du eine Datensicherung von deinem letzten LineageOS-Tablet hast, kannst du sie hier wiederherstellen.</string>
+    <string name="intro_restore_subtitle" product="default">Wenn du eine Datensicherung von deinem letzten LineageOS-Telefon hast, kannst du sie hier wiederherstellen.</string>
+    <string name="intro_restore_button">Aus Backup wiederherstellen</string>
 </resources>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Αυτή η συσκευή έχει κλειδωθεί από το χρήστη.</string>
    <string name="setup_require_cyanogen_label"><b>Απαίτηση του κωδικού πρόσβασης του λογαριασμού σας</b> για να χρησιμοποιήσετε τη συσκευή σας, ακόμα και μετά από επαναφορά εργοστασιακών ρυθμίσεων.</string>
    <string name="setup_device_locked_instructions"><i>Για να ενεργοποιήσετε/απενεργοποιήσετε αυτή τη λειτουργία, παρακαλώ πηγαίνετε στις Ρυθμίσεις &gt; Ασφάλεια</i></string>
-    <string name="settings_fingerprint_setup_title">Επιλέξτε δευτερεύον κλείδωμα οθόνης</string>
-    <string name="settings_fingerprint_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
+    <string name="settings_biometric_setup_title">Επιλέξτε δευτερεύον κλείδωμα οθόνης</string>
+    <string name="settings_biometric_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
    <string name="fingerprint_setup_title">Ρύθμιση δακτυλικού αποτυπώματος</string>
    <string name="fingerprint_setup_summary">Για να χρησιμοποιήσετε τον αισθητήρα δακτυλικών αποτυπωμάτων για να ξεκλειδώνετε την οθόνη σας, θα πρέπει να:</string>
-    <string name="fingerprint_setup_backup_lock_method">Ρυθμίστε ένα δευτερεύον κλείδωμα οθόνης</string>
    <string name="fingerprint_setup_add_fingerprint">Προσθέστε το δακτυλικό σας αποτύπωμα</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
+    <string name="face_setup_title">Ρύθμιση προσώπου</string>
+    <string name="face_setup_summary">Για να χρησιμοποιήσετε το πρόσωπό σας για να ξεκλειδώνετε την οθόνη σας, θα πρέπει να:</string>
+    <string name="face_setup_add_face">Προσθέστε το πρόσωπό σας</string>
+    <string name="biometric_setup_backup_lock_method">Ρυθμίστε ένα δευτερεύον κλείδωμα οθόνης</string>
+    <string name="biometric_setup_screen_lock_setup">Ρύθμιση κλειδώματος οθόνης</string>
    <string name="sim_locale_changed">Ανιχνεύθηκε %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Επιλέξτε κλείδωμα οθόνης</string>
    <string name="settings_lockscreen_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Προστατέψτε το τηλέφωνό σας</string>
    <string name="lockscreen_setup_summary"><b>Προστατέψτε αυτήν τη συσκευή</b> και ζητήστε ένα PIN, ένα μοτίβο ή έναν κωδικό πρόσβασης για να ξεκλειδώσετε την οθόνη</string>
    <string name="lockscreen_setup_screen_lock_setup">Ρύθμιση</string>
+    <string name="intro_restore_title">Επαναφορά εφαρμογών και δεδομένων</string>
+    <string name="intro_restore_subtitle" product="tablet">Εάν έχετε αντίγραφο ασφαλείας από το τελευταίο LineageOS tablet σας, μπορείτε να το επαναφέρετε εδώ.</string>
+    <string name="intro_restore_subtitle" product="default">Εάν έχετε αντίγραφο ασφαλείας από το τελευταίο LineageOS τηλέφωνό σας, μπορείτε να το επαναφέρετε εδώ.</string>
+    <string name="intro_restore_button">Επαναφορά από αντίγραφο ασφαλείας</string>
 </resources>
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">This device has been locked by the user.</string>
    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
-    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="settings_biometric_setup_title">Select backup screen lock type</string>
+    <string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
    <string name="fingerprint_setup_title">Fingerprint setup</string>
    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
-    <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="face_setup_title">Face setup</string>
+    <string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
+    <string name="face_setup_add_face">Add your face</string>
+    <string name="biometric_setup_backup_lock_method">Setup a secondary unlock method</string>
+    <string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
    <string name="sim_locale_changed">%1$s SIM detected</string>
    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protect your phone</string>
    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
    <string name="lockscreen_setup_screen_lock_setup">Set up</string>
+    <string name="intro_restore_title">Restore apps and data</string>
+    <string name="intro_restore_subtitle" product="tablet">If you have a backup from your last LineageOS tablet, you can restore it here.</string>
+    <string name="intro_restore_subtitle" product="default">If you have a backup from your last LineageOS phone, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
 </resources>
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">This device has been locked by the user.</string>
    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
-    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="settings_biometric_setup_title">Select backup screen lock type</string>
+    <string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
    <string name="fingerprint_setup_title">Fingerprint setup</string>
    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
-    <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="face_setup_title">Face setup</string>
+    <string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
+    <string name="face_setup_add_face">Add your face</string>
+    <string name="biometric_setup_backup_lock_method">Setup a secondary unlock method</string>
+    <string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
    <string name="sim_locale_changed">%1$s SIM detected</string>
    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protect your phone</string>
    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
    <string name="lockscreen_setup_screen_lock_setup">Set up</string>
+    <string name="intro_restore_title">Restore apps and data</string>
+    <string name="intro_restore_subtitle" product="tablet">If you have a backup from your last LineageOS tablet, you can restore it here.</string>
+    <string name="intro_restore_subtitle" product="default">If you have a backup from your last LineageOS phone, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
 </resources>
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">This device has been locked by the user.</string>
    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
-    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="settings_biometric_setup_title">Select backup screen lock type</string>
+    <string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
    <string name="fingerprint_setup_title">Fingerprint setup</string>
    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
-    <string name="fingerprint_setup_backup_lock_method">Set up a secondary unlock method</string>
    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="face_setup_title">Face setup</string>
+    <string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
+    <string name="face_setup_add_face">Add your face</string>
+    <string name="biometric_setup_backup_lock_method">Set up a secondary unlock method</string>
+    <string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
    <string name="sim_locale_changed">%1$s SIM detected</string>
    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protect your phone</string>
    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
    <string name="lockscreen_setup_screen_lock_setup">Set up</string>
+    <string name="intro_restore_title">Restore apps and data</string>
+    <string name="intro_restore_subtitle" product="tablet">If you have a backup from your last LineageOS tablet, you can restore it here.</string>
+    <string name="intro_restore_subtitle" product="default">If you have a backup from your last LineageOS phone, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
 </resources>
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">This device has been locked by the user.</string>
    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings &gt; Security</i></string>
-    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
-    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <string name="settings_biometric_setup_title">Select backup screen lock type</string>
+    <string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
    <string name="fingerprint_setup_title">Fingerprint setup</string>
    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
-    <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="face_setup_title">Face setup</string>
+    <string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
+    <string name="face_setup_add_face">Add your face</string>
+    <string name="biometric_setup_backup_lock_method">Setup a secondary unlock method</string>
+    <string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
    <string name="sim_locale_changed">%1$s SIM detected</string>
    <string name="settings_lockscreen_setup_title">Select screen lock type</string>
    <string name="settings_lockscreen_setup_details">How would you like to lock your screen?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protect your phone</string>
    <string name="lockscreen_setup_summary"><b>Protect this device</b> and require a PIN, pattern, or password to unlock the screen</string>
    <string name="lockscreen_setup_screen_lock_setup">Set up</string>
+    <string name="intro_restore_title">Restore apps and data</string>
+    <string name="intro_restore_subtitle" product="tablet">If you have a backup from your last LineageOS tablet, you can restore it here.</string>
+    <string name="intro_restore_subtitle" product="default">If you have a backup from your last LineageOS phone, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
 </resources>
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -61,17 +61,21 @@
    <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
    <string name="setup_require_cyanogen_label"><b>Se necesita la contraseña de la cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento de fábrica.</string>
    <string name="setup_device_locked_instructions"><i>Para activar y desactivar esta característica, ve a «Ajustes &gt; Seguridad»</i></string>
-    <string name="settings_fingerprint_setup_title">Selecciona el tipo de copia de seguridad de pantalla bloqueada</string>
-    <string name="settings_fingerprint_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+    <string name="settings_biometric_setup_title">Selecciona el tipo de copia de seguridad de pantalla bloqueada</string>
+    <string name="settings_biometric_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
    <string name="fingerprint_setup_title">Ajustes de huella digital</string>
    <string name="fingerprint_setup_summary">Para utilizar el sensor de huella digital para desbloquear la pantalla, deberás:</string>
-    <string name="fingerprint_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
    <string name="fingerprint_setup_add_fingerprint">Añadir tu huella digital</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
+    <string name="face_setup_title">Configuración facial</string>
+    <string name="face_setup_add_face">Añadir cara</string>
+    <string name="biometric_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
+    <string name="biometric_setup_screen_lock_setup">Configurar la pantalla bloqueada</string>
    <string name="sim_locale_changed">%1$s SIM detectada</string>
    <string name="settings_lockscreen_setup_title">Seleccione el tipo de bloqueo de pantalla</string>
    <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+    <string name="lockscreen_setup_title" product="tablet">Protege tu tableta</string>
    <string name="lockscreen_setup_title" product="default">Protege el teléfono</string>
    <string name="lockscreen_setup_summary"><b>Proteger dispositivo</b> y solicitar PIN/patrón/contraseña para desbloquear pantalla</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
+    <string name="intro_restore_button">Restaurar desde copia de seguridad</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -41,14 +41,15 @@
    <string name="date_time_summary">Configura la zona horaria y ajusta la fecha y hora actuales si es necesario</string>
    <string name="backup_data_summary"><b>Copia de seguridad</b> de los datos de aplicación, las contraseñas Wi-Fi y otros ajustes en los servidores de Google</string>
    <string name="other_services_summary">Estos servicios hacen que Google trabajar para ti, y puedes activarlos o desactivarlos en cualquier momento. Los datos se utilizarán según la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
-    <string name="location_services_summary">Los servicios de localización permiten al sistema y a otras aplicaciones recopilar y utilizar datos tales como tu ubicación aproximada. Por ejemplo, una aplicación puede utilizar tu ubicación aproximada para localizar cafeterías cercanas.</string>
-    <string name="location_access_summary"><b>Permitir aplicaciones que han solicitado tu permiso</b> para usar tu información de ubicación. Esto puede incluir tu localización actual y ubicaciones recientes.</string>
+    <string name="location_services_summary">Los servicios de ubicación permiten al sistema y a otras aplicaciones recopilar y utilizar datos tales como tu ubicación aproximada. Por ejemplo, una aplicación puede utilizar tu ubicación aproximada para localizar cafeterías cercanas.</string>
+    <string name="location_access_summary"><b>Permitir aplicaciones que han solicitado tu permiso</b> para usar tu información de ubicación. Esto puede incluir tus ubicaciones anteriores y la actual.</string>
    <string name="setup_mobile_data">Activar datos móviles</string>
    <string name="setup_mobile_data_no_service">Sin servicio</string>
    <string name="setup_mobile_data_emergency_only">Solo llamadas de emergencia</string>
    <string name="enable_mobile_data_summary">¿Deseas utilizar los datos móviles durante la instalación? Activar los datos móviles puede provocar cargos de datos.</string>
    <string name="no">No</string>
    <string name="yes">Sí</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Llamada de emergencia</string>
    <string name="setup_services">Características de LineageOS</string>
    <string name="services_explanation" product="tablet">Estos servicios sirven para extender las capacidades del tablet. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
@@ -61,17 +62,24 @@
    <string name="setup_device_locked">Este dispositivo ha sido bloqueado por el usuario.</string>
    <string name="setup_require_cyanogen_label"><b>Requieren la contraseña de tu cuenta</b> para poder utilizar el dispositivo incluso después de un restablecimiento.</string>
    <string name="setup_device_locked_instructions"><i>Para activar o desactivar esta función, ve a Ajustes &gt; Seguridad</i></string>
-    <string name="settings_fingerprint_setup_title">Selecciona el tipo de copia de seguridad de pantalla de bloqueo</string>
-    <string name="settings_fingerprint_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
+    <string name="settings_biometric_setup_title">Selecciona el tipo de copia de seguridad de pantalla de bloqueo</string>
+    <string name="settings_biometric_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
    <string name="fingerprint_setup_title">Ajustes de huella digital</string>
    <string name="fingerprint_setup_summary">Para utilizar el sensor de huella digital para desbloquear la pantalla, necesitarás:</string>
-    <string name="fingerprint_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
    <string name="fingerprint_setup_add_fingerprint">Añade tu huella digital</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
+    <string name="face_setup_title">Configuración facial</string>
+    <string name="face_setup_summary">Para utilizar su cara para desbloquear la pantalla, necesitarás:</string>
+    <string name="face_setup_add_face">Añadir su cara</string>
+    <string name="biometric_setup_backup_lock_method">Establecer un método secundario de desbloqueo</string>
+    <string name="biometric_setup_screen_lock_setup">Ajustes de pantalla de bloqueo</string>
    <string name="sim_locale_changed">%1$s SIM detectada</string>
    <string name="settings_lockscreen_setup_title">Seleccione el tipo de bloqueo de la pantalla</string>
    <string name="settings_lockscreen_setup_details">¿Cómo quieres bloquear tu pantalla?</string>
    <string name="lockscreen_setup_title" product="default">Proteja su teléfono</string>
    <string name="lockscreen_setup_summary"><b>Proteger este dispositivo</b> y establecer un PIN, un patrón o una contraseña para desbloquear la pantalla</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
+    <string name="intro_restore_title">Restaurar aplicaciones y datos</string>
+    <string name="intro_restore_subtitle" product="tablet">Si tiene una copia de seguridad de su última tableta LineageOS, puede restaurarla aquí.</string>
+    <string name="intro_restore_subtitle" product="default">Si tiene una copia de seguridad de su último teléfono LineageOS, puede restaurarla aquí.</string>
+    <string name="intro_restore_button">Restaurar desde copia de seguridad</string>
 </resources>
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -54,12 +54,19 @@
    <string name="setup_unlock">Ava lukustus</string>
    <string name="setup_device_locked">Seade on kasutaja poolt lukustatud.</string>
    <string name="setup_device_locked_instructions"><i>Funktsiooni sisse/välja lülitamiseks mine Seaded &gt; Turvalisus</i></string>
-    <string name="settings_fingerprint_setup_title">Valige alternatiivne ekraani luku tüüp</string>
-    <string name="settings_fingerprint_setup_details">Kuidas soovite ekraani lukustada?</string>
+    <string name="settings_biometric_setup_title">Valige alternatiivne ekraani luku tüüp</string>
+    <string name="settings_biometric_setup_details">Kuidas soovite ekraani lukustada?</string>
    <string name="fingerprint_setup_title">Sõrmejälgede seadistamine</string>
    <string name="fingerprint_setup_summary">Et kasutada sõrmejäljelugejat ekraani avamiseks, peate:</string>
-    <string name="fingerprint_setup_backup_lock_method">Häälesta teisejärguline avamise meetod</string>
    <string name="fingerprint_setup_add_fingerprint">Lisa oma sõrmejälg</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ekraaniluku seadistamine</string>
+    <string name="face_setup_title">Näo seadistus</string>
+    <string name="face_setup_summary">Näo kasutamiseks ekraani lahti lukustamisel pead sa:</string>
+    <string name="face_setup_add_face">Lisa oma nägu</string>
+    <string name="biometric_setup_backup_lock_method">Häälesta teisejärguline avamise meetod</string>
+    <string name="biometric_setup_screen_lock_setup">Ekraaniluku seadistamine</string>
    <string name="settings_lockscreen_setup_details">Kuidas soovite ekraani lukustada?</string>
+    <string name="intro_restore_title">Taasta rakendused ja andmed</string>
+    <string name="intro_restore_subtitle" product="tablet">Kui sul on viimase LineageOSi tahvelarvuti varundus olemas, saad selle siin taastada.</string>
+    <string name="intro_restore_subtitle" product="default">Kui sul on viimase LineageOSi telefoni varundus olemas, saad selle siin taastada.</string>
+    <string name="intro_restore_button">Taasta varundusest</string>
 </resources>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -61,13 +61,13 @@
    <string name="setup_device_locked">Erabiltzaileak gailu hau blokeatu du.</string>
    <string name="setup_require_cyanogen_label"><b>Eskatu zure kontuaren pasahitza</b> gailua erabiltzeko lantegiko jatorrizko ezarpenetara berrezarri eta gero ere.</string>
    <string name="setup_device_locked_instructions"><i>Ezaugarri hau gaitu edo ezgaitzeko zoaz hona: Ezarpenak &gt; Segurtasuna</i></string>
-    <string name="settings_fingerprint_setup_title">Aukeratu ordezko pantaila blokeo mota</string>
-    <string name="settings_fingerprint_setup_details">Nola blokeatu nahi duzu pantaila?</string>
+    <string name="settings_biometric_setup_title">Aukeratu ordezko pantaila blokeo mota</string>
+    <string name="settings_biometric_setup_details">Nola blokeatu nahi duzu pantaila?</string>
    <string name="fingerprint_setup_title">Hatz-markaren ezarpena</string>
    <string name="fingerprint_setup_summary">Zure hatz-marka sentsorea erabiliz zure pantaila desblokeatzeko, honako hau egin behar duzu:</string>
-    <string name="fingerprint_setup_backup_lock_method">Ezarri ordezko desblokeo metodo bat</string>
    <string name="fingerprint_setup_add_fingerprint">Gehitu zure hatz-marka</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
+    <string name="biometric_setup_backup_lock_method">Ezarri ordezko desblokeo metodo bat</string>
+    <string name="biometric_setup_screen_lock_setup">Ezarri pantaila blokeoa</string>
    <string name="sim_locale_changed">%1$s SIM antzeman da</string>
    <string name="settings_lockscreen_setup_title">Hautatu pantaila-blokeo mota</string>
    <string name="settings_lockscreen_setup_details">Nola blokeatu nahi duzu pantaila?</string>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,10 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">راهنمای راه‌اندازی</string>
-    <string name="next">مرحله بعد</string>
-    <string name="skip">رد شدن</string>
    <string name="start">شروع</string>
-    <string name="ok">بسیارخب</string>
    <string name="loading">یک لحظه لطفا\u2026</string>
    <string name="setup_complete">راه‌اندازی کامل شد</string>
    <string name="setup_welcome">خوش آمدید</string>
@@ -52,13 +49,13 @@
    <string name="setup_unlock">باز کردن</string>
    <string name="setup_device_locked">این دستگاه توسط کاربر قفل شده است.</string>
    <string name="setup_device_locked_instructions"><i>برای خاموش/روشن کردن این ویژگی، لطفا به تنظیمات &gt; امنیت بروید</i></string>
-    <string name="settings_fingerprint_setup_title">انتخاب قفل پشتیبان صفحه</string>
-    <string name="settings_fingerprint_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
+    <string name="settings_biometric_setup_title">انتخاب قفل پشتیبان صفحه</string>
+    <string name="settings_biometric_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
    <string name="fingerprint_setup_title">تنظیمات اثر انگشت</string>
    <string name="fingerprint_setup_summary">برای استفاده از حسگر اثر انگشت برای باز کردن قفل صفحه، به این موارد نیاز دارید:</string>
-    <string name="fingerprint_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
    <string name="fingerprint_setup_add_fingerprint">افزودن اثر انگشت خود</string>
-    <string name="fingerprint_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
+    <string name="biometric_setup_backup_lock_method">تنظیم روش دوم باز کردن قفل</string>
+    <string name="biometric_setup_screen_lock_setup">تنظیمات قفل صفحه</string>
    <string name="settings_lockscreen_setup_details">چگونه می‌خواهید صفحه خود را قفل کنید؟</string>
    <string name="lockscreen_setup_screen_lock_setup">برپا سازی</string>
 </resources>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">Haluatko käyttää mobiilidataa asennuksen aikana? Mobiilidatan käyttöönottaminen voi aiheuttaa tiedonsiirtokuluja.</string>
    <string name="no">Ei</string>
    <string name="yes">Kyllä</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Hätäpuhelu</string>
    <string name="setup_services">LineageOS-ominaisuudet</string>
    <string name="services_explanation" product="tablet">Nämä palvelut toimivat tablettisi ominaisuuksien parantamiseksi. Tietoja käytetään LineageOS:n <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
@@ -61,17 +62,25 @@
    <string name="setup_device_locked">Käyttäjä on lukinnut laitteen.</string>
    <string name="setup_require_cyanogen_label"><b>Vaadi tilin salasana</b> käyttääksesi laitetta myös tehdasasetusten palautuksen jälkeen.</string>
    <string name="setup_device_locked_instructions"><i>Poistaaksesi tämän ominaisuuden käytöstä/ottaaksesi käyttöön, mene Asetukset &gt; Suojaus</i></string>
-    <string name="settings_fingerprint_setup_title">Valitse toinen näytön lukitustapa</string>
-    <string name="settings_fingerprint_setup_details">Miten haluat lukita näyttösi?</string>
+    <string name="settings_biometric_setup_title">Valitse toinen näytön lukitustapa</string>
+    <string name="settings_biometric_setup_details">Miten haluat lukita näyttösi?</string>
    <string name="fingerprint_setup_title">Sormenjäljen asetus</string>
    <string name="fingerprint_setup_summary">Käyttääksesi sormenjälkitunnistinta avataksesi näytön lukituksen, sinun tulee:</string>
-    <string name="fingerprint_setup_backup_lock_method">Asentaa toissijainen näytön avaustapa</string>
    <string name="fingerprint_setup_add_fingerprint">Lisää sormenjälkesi</string>
-    <string name="fingerprint_setup_screen_lock_setup">Aseta näytön lukitus</string>
+    <string name="face_setup_title">Kasvojen asetus</string>
+    <string name="face_setup_summary">Käyttääksesi kasvontunnistusta avataksesi näytön lukituksen, sinun tulee:</string>
+    <string name="face_setup_add_face">Lisätä kasvosi</string>
+    <string name="biometric_setup_backup_lock_method">Asentaa toissijainen näytön avaustapa</string>
+    <string name="biometric_setup_screen_lock_setup">Aseta näytön lukitus</string>
    <string name="sim_locale_changed">%1$s SIM tunnistettu</string>
    <string name="settings_lockscreen_setup_title">Valitse näytön lukitustapa</string>
    <string name="settings_lockscreen_setup_details">Miten haluat lukita näyttösi?</string>
+    <string name="lockscreen_setup_title" product="tablet">Suojaa tablettisi</string>
    <string name="lockscreen_setup_title" product="default">Suojaa puhelintasi</string>
    <string name="lockscreen_setup_summary"><b>Suojaa laitetta</b> avaamalla näytön lukitus PIN-koodin, kuvion tai salasanan avulla</string>
    <string name="lockscreen_setup_screen_lock_setup">Asetusten määritys</string>
+    <string name="intro_restore_title">Palauta sovellukset ja tiedot</string>
+    <string name="intro_restore_subtitle" product="tablet">Jos sinulla on varmuuskopio aiemmasta LineageOS-tabletista, voit palauttaa sen tässä.</string>
+    <string name="intro_restore_subtitle" product="default">Jos sinulla on varmuuskopio aiemmasta LineageOS-puhelimesta, voit palauttaa sen tässä.</string>
+    <string name="intro_restore_button">Palauta varmuuskopiosta</string>
 </resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -62,18 +62,25 @@
    <string name="setup_device_locked">Cet appareil a été verrouillé par l\'utilisateur.</string>
    <string name="setup_require_cyanogen_label"><b>Nécessite le mot de passe de votre compte</b> afin d\'utiliser votre appareil même après une réinitialisation d\'usine.</string>
    <string name="setup_device_locked_instructions"><i>Pour activer/désactiver cette fonction, veuillez vous rendre dans Paramètres &gt; Sécurité</i></string>
-    <string name="settings_fingerprint_setup_title">Sélection du type de verrouillage d\'écran de sauvegarde</string>
-    <string name="settings_fingerprint_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
+    <string name="settings_biometric_setup_title">Sélection du type de verrouillage d\'écran de sauvegarde</string>
+    <string name="settings_biometric_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
    <string name="fingerprint_setup_title">Enregistrement d\'empreintes digitales</string>
    <string name="fingerprint_setup_summary">Pour utiliser le capteur d\'empreintes digitales pour déverrouiller votre écran, vous devrez :</string>
-    <string name="fingerprint_setup_backup_lock_method">Configurer une méthode de déblocage secondaire</string>
    <string name="fingerprint_setup_add_fingerprint">Ajouter votre empreinte digitale</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
+    <string name="face_setup_title">Configuration du visage</string>
+    <string name="face_setup_summary">Pour utiliser votre visage afin de déverrouiller votre écran, vous devrez :</string>
+    <string name="face_setup_add_face">Ajouter votre visage</string>
+    <string name="biometric_setup_backup_lock_method">Configurer une méthode de déblocage secondaire</string>
+    <string name="biometric_setup_screen_lock_setup">Configurer le verrouillage de l\'écran</string>
    <string name="sim_locale_changed">%1$s carte SIM détectée</string>
    <string name="settings_lockscreen_setup_title">Sélectionner le type de verrouillage de l\'écran</string>
    <string name="settings_lockscreen_setup_details">Comment voulez-vous verrouiller votre écran ?</string>
    <string name="lockscreen_setup_title" product="tablet">Protégez votre tablette</string>
    <string name="lockscreen_setup_title" product="default">Protéger votre téléphone</string>
-    <string name="lockscreen_setup_summary"><b>\"Protéger l\'appareil\"</b>\" et exiger code, schéma ou mot de passe pour déverrouiller l\'écran\"</string>
+    <string name="lockscreen_setup_summary"><b>Protéger l\'appareil</b> et exiger un code, schéma ou mot de passe pour déverrouiller l\'écran</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurer</string>
+    <string name="intro_restore_title">Restaurer les applications et les données</string>
+    <string name="intro_restore_subtitle" product="tablet">Si vous avez une sauvegarde de votre précédente tablette LineageOS, vous pouvez la restaurer ici.</string>
+    <string name="intro_restore_subtitle" product="default">Si vous avez une sauvegarde de votre précédent téléphone LineageOS, vous pouvez la restaurer ici.</string>
+    <string name="intro_restore_button">Restaurer depuis une sauvegarde</string>
 </resources>
--- a/res/values-fur-rIT/strings.xml
+++ b/res/values-fur-rIT/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Instalazion vuidade</string>
+    <string name="next">Indenant</string>
+    <string name="skip">Salte</string>
+    <string name="start">Scomence</string>
+    <string name="done">Fat</string>
+    <string name="ok">Va ben</string>
+    <string name="loading">Dome un secont\u2026</string>
+    <string name="setup_complete">Configurazion completade</string>
+    <string name="setup_welcome">Benvignûts</string>
+    <string name="setup_locale">Lenghe</string>
+    <string name="setup_wifi">Selezione il Wi-Fi</string>
+    <string name="setup_sim_missing">E mancje la schede SIM</string>
+    <string name="setup_choose_data_sim">Sielç une SIM pe conession dâts</string>
+    <string name="setup_location">Servizis di localizazion</string>
+    <string name="setup_other">Altris servizis</string>
+    <string name="setup_datetime">Date e ore</string>
+    <string name="setup_current_date">Date atuâl</string>
+    <string name="setup_current_time">Ore atuâl</string>
+    <string name="sim_missing_summary" product="tablet">No je stade rilevade nissune schede SIM tal to tablet. Per inserî une schede SIM, lei lis istruzions dadis cul to dispositîf.</string>
+    <string name="sim_missing_summary" product="default">No je stade rilevade nissune schede SIM tal to telefon. Per inserî une schede SIM, lei lis istruzions dadis cul to dispositîf.</string>
+    <string name="choose_data_sim_summary" product="tablet">Ce SIM desideristu doprâ pe conession dâts? La SIM selezionade e podarès intivâ coscj di rêt viodût che e ven doprade par configurâ il to tablet.</string>
+    <string name="choose_data_sim_summary" product="default">Ce SIM desideristu doprâ pe conession dâts? La SIM selezionade e podarès intivâ coscj di rêt viodût che e ven doprade par configurâ il to telefon.</string>
+    <string name="date_time_summary">Configure il fûs orari e se al covente juste la date e la ore</string>
+    <string name="backup_data_summary"><b>Fâs il Back-up</b> dai dâts des aplicazions, des passwords dai Wi-Fis e altris impostazions sui servidôrs di Google</string>
+    <string name="other_services_summary">Chescj servizis a permetin a Google di funzionâ par te e tu puedis ativâju o disativâju in cualsisei moment. I dâts a vignaran doprâts in conformitât cu la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> di Google.</string>
+    <string name="location_services_summary">I servizis di localizazion a permetin a Maps e a altris aplicazions di tirâ dongje e doprâ dâts come la tô posizion. Par esempli, une aplicazion e podarès doprâ la tô posizion aprossimative par individuâ lis ostariis tai contors.</string>
+    <string name="location_access_summary"><b>Permet aes aplicazions che a àn domandât la tô autorizazion</b> di doprâ informazions su la tô posizion. Chest al pues includi la tô posizion atuâl e chês di prime.</string>
+    <string name="setup_mobile_data">Ative dâts mobii</string>
+    <string name="setup_mobile_data_no_service">Nissun servizi</string>
+    <string name="setup_mobile_data_emergency_only">Dome clamadis di emergjence</string>
+    <string name="enable_mobile_data_summary">Desideristu doprâ i dâts mobii dulinvie la configurazion? La ativazion dai dâts mobii e podarès puartâ a coscj adizionâi.</string>
+    <string name="no">No</string>
+    <string name="yes">Sì</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">Clamade di emergjence</string>
+    <string name="setup_services">Funzionalitâts di LineageOS</string>
+    <string name="services_explanation" product="tablet">Chescj servizis a funzionin par slargjâ lis funzionalitâts dal to tablet. I dâts a vignaran doprâts in conformitât cu la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> di LineageOS.</string>
+    <string name="services_explanation" product="default">Chescj servizis a funzionin par slargjâ lis funzionalitâts dal to telefon. I dâts a vignaran doprâts in conformitât cu la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> di LineageOS.</string>
+    <string name="services_privacy_policy">Informative su la riservatece</string>
+    <string name="services_help_improve_cm">Jude a miorâ <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> inviant in automatic dâts diagnostics e di utilizazion a LineageOS. Nol sarà pussibil doprâ chestis informazions par identificâti ma a dan une man ai grups che a lavorin su robis come la durade de batarie, lis prestazions des aplicazions e gnovis funzions di <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
+    <string name="services_os_nav_keys_label"><b>Dopre i botons virtuâi sul schermi</b> invezit di chei fisics.</string>
+    <string name="setup_unlock">Sbloche</string>
+    <string name="setup_device_locked">Chest dispositîf al è stât blocât dal utent.</string>
+    <string name="setup_require_cyanogen_label"><b>E covente la password dal to account</b> par podê doprâ il dispositîf ancje dopo il ripristinament di fabriche.</string>
+    <string name="setup_device_locked_instructions"><i>Par ativâ/disativâ cheste funzionalitât, va in Impostazions &gt; Sigurece</i></string>
+    <string name="settings_biometric_setup_title">Selezione la schermade di bloc di risierve</string>
+    <string name="settings_biometric_setup_details">Cemût desideristu blocâ il schermi?</string>
+    <string name="fingerprint_setup_title">Configurazion impronts digjitâi</string>
+    <string name="fingerprint_setup_summary">Par doprâ il sensôr di impronts digjitâi par sblocâ il schermi, ti varâs di:</string>
+    <string name="fingerprint_setup_add_fingerprint">Zontâ il to impront</string>
+    <string name="face_setup_title">Configurazion de muse</string>
+    <string name="face_setup_summary">Par doprâ la tô muse par sblocâ il schermi, tu varâs di:</string>
+    <string name="face_setup_add_face">Zontâ la tô muse</string>
+    <string name="biometric_setup_backup_lock_method">Configurâ un metodi di sbloc secondari</string>
+    <string name="biometric_setup_screen_lock_setup">Configure un bloc schermi</string>
+    <string name="sim_locale_changed">SIM %1$s rilevade</string>
+    <string name="settings_lockscreen_setup_title">Selezione il gjenar di bloc schermi</string>
+    <string name="settings_lockscreen_setup_details">Cemût desideristu blocâ il schermi?</string>
+    <string name="lockscreen_setup_title" product="tablet">Protêç il to tablet</string>
+    <string name="lockscreen_setup_title" product="default">Protêç il to telefon</string>
+    <string name="lockscreen_setup_summary"><b>Protêç chest dispositîf</b> e domande un PIN, une secuence o une password par sblocâ il schermi</string>
+    <string name="lockscreen_setup_screen_lock_setup">Configure</string>
+    <string name="intro_restore_title">Ripristine aplicazions e dâts</string>
+    <string name="intro_restore_subtitle" product="tablet">Se tu âs un backup dal ultin tablet cun LineageOS, tu puedis ripristinâlu achì.</string>
+    <string name="intro_restore_subtitle" product="default">Se tu âs un backup dal ultin telefon cun LineageOS, tu puedis ripristinâlu achì.</string>
+    <string name="intro_restore_button">Ripristine dal backup</string>
+</resources>
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -62,13 +62,13 @@
    <string name="setup_device_locked">Dit apparaat is beskoattele troch de brûker.</string>
    <string name="setup_require_cyanogen_label"><b>Jo accountwachtwurd fereaskje</b> om it apparaat te brûken, sels nei weromsetten nei fabryksynstellingen.</string>
    <string name="setup_device_locked_instructions"><i>Om dizze funksje yn of út te skeakeljen, gean nei Ynstellingen &gt; Befeiliging</i></string>
-    <string name="settings_fingerprint_setup_title">Reservemetoade selektearje foar skermbeskoatteling</string>
-    <string name="settings_fingerprint_setup_details">Hoe wolle jo jo skerm beskoattelje?</string>
+    <string name="settings_biometric_setup_title">Reservemetoade selektearje foar skermbeskoatteling</string>
+    <string name="settings_biometric_setup_details">Hoe wolle jo jo skerm beskoattelje?</string>
    <string name="fingerprint_setup_title">Fingerôfdruk ynstelle</string>
    <string name="fingerprint_setup_summary">Om de fingerôfdruksensor te brûken om jo skerm te ûntskoatteljen moatte jo:</string>
-    <string name="fingerprint_setup_backup_lock_method">In twaddde ûntskoattelmetoade ynstelle</string>
    <string name="fingerprint_setup_add_fingerprint">Jo fingerôfdruk tafoegje</string>
-    <string name="fingerprint_setup_screen_lock_setup">Skermbeskoatteling ynstelle</string>
+    <string name="biometric_setup_backup_lock_method">In twaddde ûntskoattelmetoade ynstelle</string>
+    <string name="biometric_setup_screen_lock_setup">Skermbeskoatteling ynstelle</string>
    <string name="sim_locale_changed">%1$s simkaart detektearre</string>
    <string name="settings_lockscreen_setup_title">Type skermbeskoatteling selektearje</string>
    <string name="settings_lockscreen_setup_details">Hoe wolle jo jo skerm beskoattelje?</string>
--- a/res/values-gd/strings.xml
+++ b/res/values-gd/strings.xml
@@ -22,8 +22,8 @@
    <string name="start">Tòisich</string>
    <string name="done">Deiseil</string>
    <string name="ok">Ceart ma-thà</string>
-    <string name="loading">Fuirich greiseag…</string>
-    <string name="setup_complete">Tha an rèiteachadh coileanta</string>
+    <string name="loading">Fuirich greiseag\u2026</string>
+    <string name="setup_complete">Tha an rèiteachadh deiseil</string>
    <string name="setup_welcome">Fàilte ort</string>
    <string name="setup_locale">Cànan</string>
    <string name="setup_wifi">Tagh WiFi</string>
@@ -31,16 +31,16 @@
    <string name="setup_choose_data_sim">Tagh SIM airson dàta</string>
    <string name="setup_location">Seirbheisean ionaid</string>
    <string name="setup_other">Seirbheisean eile</string>
-    <string name="setup_datetime">Ceann-là ⁊ an t-àm</string>
+    <string name="setup_datetime">Ceann-là ⁊ àm</string>
    <string name="setup_current_date">An ceann-là an-diugh</string>
    <string name="setup_current_time">An t-àm làithreach</string>
-    <string name="sim_missing_summary" product="tablet">Cha mhothaich sinn do chairt SIM san tablaid agad. Airson cairt SIM a chur a-steach, leugh na mìneachaidhean a fhuair thu leis an uidheam agad.</string>
-    <string name="sim_missing_summary" product="default">Cha mhothaich sinn do chairt SIM san fhòn agad. Airson cairt SIM a chur a-steach, leugh na mìneachaidhean a fhuair thu leis an uidheam agad.</string>
-    <string name="choose_data_sim_summary" product="tablet">Dè an SIM a gu toigh leat cleachdadh airson dàta? Dh’fhaoidte gun èirich cosgaisean lìonraidh an cois an t-SIM a thagh thu on a thèid a chleachdadh airson an tablaid agad a shuidheachadh.</string>
-    <string name="choose_data_sim_summary" product="default">Dè an SIM a gu toigh leat cleachdadh airson dàta? Dh’fhaoidte gun èirich cosgaisean lìonraidh an cois an t-SIM a thagh thu on a thèid a chleachdadh airson an fhòn agad a shuidheachadh.</string>
+    <string name="sim_missing_summary" product="tablet">Cha do mhothaich sinn do chairt SIM san tablaid agad. Airson cairt SIM a chur a-steach, leugh na mìneachaidhean a fhuair thu leis an uidheam agad.</string>
+    <string name="sim_missing_summary" product="default">Cha do mhothaich sinn do chairt SIM san fhòn agad. Airson cairt SIM a chur a-steach, leugh na mìneachaidhean a fhuair thu leis an uidheam agad.</string>
+    <string name="choose_data_sim_summary" product="tablet">Dè an SIM a bu toigh leat cleachdadh airson dàta? Dh’fhaoidte gun èirich cosgaisean lìonraidh an cois an t-SIM a thagh thu on a thèid a chleachdadh airson an tablaid agad a shuidheachadh.</string>
+    <string name="choose_data_sim_summary" product="default">Dè an SIM a bu toigh leat cleachdadh airson dàta? Dh’fhaoidte gun èirich cosgaisean lìonraidh an cois an t-SIM a thagh thu on a thèid a chleachdadh airson an fhòn agad a shuidheachadh.</string>
    <string name="date_time_summary">Suidhich an roinn-tìde agad agus cuir an ceann-là ’s an t-àm air gleus ma bhios feum air</string>
    <string name="backup_data_summary">Dèan <b>lethbhreac-ghlèidhidh</b> de dhàta nan aplacaidean, faclan-faire WiFi ’s roghainnean eile air frithealaichean Google</string>
-    <string name="other_services_summary">Nì Google obair dhut leis na seirbheisean seo agus ’s urrainn dhut an cur dheth uair sam bith. Thèid dàta a chleachdadh a-rèir a’ &lt;xliff:g id="name" example="Privacy Policy”&gt;%s&lt;/xliff:g&gt; aig Google.</string>
+    <string name="other_services_summary">Nì Google obair dhut leis na seirbheisean seo agus ’s urrainn dhut an cur dheth uair sam bith. Thèid dàta a chleachdadh a-rèir <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
    <string name="location_services_summary">Leigidh seirbheisean ionaid le aplacaidean an t-siostaim is threas-phàrtaidhean dàta a chruinneachadh ’s a chleachdadh mar d’ ionad neo-phongail. Mar eisimpleir, ’s dòcha gun cleachd aplacaid fiosrachadh mu far a bheil thu airson cafaidhean a tha faisg ort a shealltainn dhut.</string>
    <string name="location_access_summary"><b>Leig le aplacaidean a dh’iarr cead uat</b> fiosrachadh mu d’ ionad a chleachdadh. Dh’fhaoidte gun gabh seo a-staigh an dà chuid d’ ionad làithreach agus far an robh thu roimhe.</string>
    <string name="setup_mobile_data">Cuir an dàta mobile air</string>
@@ -49,25 +49,29 @@
    <string name="enable_mobile_data_summary">A bheil thu airson dàta mobile a chleachdadh rè an t-suidheachaidh? Ma chuireas tu dàta mobile air, dh’fhaoidte gun èirich cosgaisean dàta ’na lùib.</string>
    <string name="no">Chan eil</string>
    <string name="yes">Tha</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> – <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Gairm-èiginn</string>
    <string name="setup_services">Gleusan LineageOS</string>
    <string name="services_explanation" product="tablet">Leudaichidh na seirbheisean seo comasan na tablaid agad. Thèid an dàta a chleachdadh a-rèir <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
    <string name="services_explanation" product="default">Leudaichidh na seirbheisean seo comasan an fhòn agad. Thèid an dàta a chleachdadh a-rèir <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
    <string name="services_privacy_policy">Poileasaidh prìobhaideachd</string>
    <string name="services_help_improve_cm">Cuidich gus piseach a thoirt air <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Cuidich gus piseach a thoirt air LineageOS">%1$s</xliff:g> is tu a’ cur dàta na diagnosachd ’s a’ chleachdaidh gu LineageOS gu fèin-obrachail. Cha ghabh an dàta sin a chleachdadh airson d’ aithneachadh agus bheir e cuideachadh dha na sgiobaidhean a bhios ag obair air rudan mar beatha a’ bhataraidh, dèanadas nan aplacaidean agus gleusan <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ùra.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> is tu a’ cur dàta na diagnosachd ’s a’ chleachdaidh gu LineageOS gu fèin-obrachail. Cha ghabh an dàta sin a chleachdadh airson d’ aithneachadh agus bheir e cuideachadh dha na sgiobaidhean a bhios ag obair air rudan mar beatha a’ bhataraidh, dèanadas nan aplacaidean agus gleusan <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ùra.</string>
    <string name="services_os_nav_keys_label"><b>Cleachd iuchraichean seòladaireachd air an sgrìn</b> seach iuchraichean bathair-chruaidh.</string>
    <string name="setup_unlock">Thoir a’ ghlas dheth</string>
    <string name="setup_device_locked">Chaidh an t-uidheam seo a ghlasadh leis a’ chleachdaiche.</string>
    <string name="setup_require_cyanogen_label"><b>Iarr facal-faire a’ chunntais agad</b> airson an t-uidheam agad a chleachdadh, fiù às dèidh tilleadh gu roghainnean an fhactaraidh.</string>
    <string name="setup_device_locked_instructions"><i>Airson an gleus seo a chur dheth no air, rach gu “Roghainnean” &gt; “Tèarainteachd”</i></string>
-    <string name="settings_fingerprint_setup_title">Tagh seòrsa dàrnach de ghlasadh na sgrìn</string>
-    <string name="settings_fingerprint_setup_details">Dè an dòigh air am bu chaomh leat an sgrìn agad a ghlasadh?</string>
+    <string name="settings_biometric_setup_title">Tagh seòrsa dàrnach de ghlasadh na sgrìn</string>
+    <string name="settings_biometric_setup_details">Dè an dòigh air am bu chaomh leat an sgrìn agad a ghlasadh?</string>
    <string name="fingerprint_setup_title">Suidhich lorg-mheòir</string>
-    <string name="fingerprint_setup_summary">Seo na dh’fheumas tu dèanamh mus cleachd thu mothaichear nan lorgan-meòir a chur a’ ghlas far an sgrìn:</string>
-    <string name="fingerprint_setup_backup_lock_method">Suidhich dòigh dhàrnach airson a’ ghlas a thoirt far na sgrìn</string>
+    <string name="fingerprint_setup_summary">Seo na dh’fheumas tu dèanamh mus cleachd thu mothaichear nan lorgan-meòir a chur a’ ghlas far na sgrìn:</string>
    <string name="fingerprint_setup_add_fingerprint">Cuir do lorg-mheòir ris</string>
-    <string name="fingerprint_setup_screen_lock_setup">Suidhich glasadh na sgrìn</string>
+    <string name="face_setup_title">Suidheachadh aodainn</string>
+    <string name="face_setup_summary">Seo na dh’fheumas tu dèanamh mus cleachd thu d’ aodann a chur a’ ghlas far an sgrìn:</string>
+    <string name="face_setup_add_face">Cuir d’ aodann ris</string>
+    <string name="biometric_setup_backup_lock_method">Suidhich dòigh dhàrnach airson a’ ghlas a thoirt far na sgrìn</string>
+    <string name="biometric_setup_screen_lock_setup">Suidhich glasadh na sgrìn</string>
    <string name="sim_locale_changed">Mhothaich sinn do SIM %1$s</string>
    <string name="settings_lockscreen_setup_title">Tagh seòrsa de ghlasadh na sgrìn</string>
    <string name="settings_lockscreen_setup_details">Dè an dòigh air am bu chaomh leat an sgrìn agad a ghlasadh?</string>
@@ -75,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Dìon am fòn agad</string>
    <string name="lockscreen_setup_summary"><b>Dìon an t-uidheam seo</b> agus iarr PIN, pàtran no facal-faire gus a’ ghlas a thoirt far na sgrìn</string>
    <string name="lockscreen_setup_screen_lock_setup">Suidhich</string>
+    <string name="intro_restore_title">Aisig aplacaidean is dàta</string>
+    <string name="intro_restore_subtitle" product="tablet">Ma tha lethbhreac-glèidhidh on tablaid LineageOS mu dheireadh agad, ’s urrainn dhut aiseag an-seo.</string>
+    <string name="intro_restore_subtitle" product="default">Ma tha lethbhreac-glèidhidh on fhòn LineageOS mu dheireadh agad, ’s urrainn dhut aiseag an-seo.</string>
+    <string name="intro_restore_button">Aisig o lethbhreac-glèidhidh</string>
 </resources>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Este dispositivo foi bloqueado polo usuario.</string>
    <string name="setup_require_cyanogen_label"><b>Precísase o seu contrasinal</b> para poder utilizar o seu dispositivo mesmo tras unha restauración de fábrica.</string>
    <string name="setup_device_locked_instructions"><i>Para acender ou apagar esta funcionalidade, vaia a Configuración &gt; Seguranza</i></string>
-    <string name="settings_fingerprint_setup_title">Seleccione o tipo de copia de seguranza de pantalla de bloqueo</string>
-    <string name="settings_fingerprint_setup_details">Como quere bloquear a súa pantalla?</string>
+    <string name="settings_biometric_setup_title">Seleccione o tipo de copia de seguranza de pantalla de bloqueo</string>
+    <string name="settings_biometric_setup_details">Como quere bloquear a súa pantalla?</string>
    <string name="fingerprint_setup_title">Configuración da pegada dactilar</string>
    <string name="fingerprint_setup_summary">Para utilizar o sensor de pegada dactilar co que desbloquear a pantalla, precisará:</string>
-    <string name="fingerprint_setup_backup_lock_method">Configurar un método secundario de desbloqueo</string>
    <string name="fingerprint_setup_add_fingerprint">Engadir a súa pegada dactilar</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configurar o bloqueo da pantalla</string>
+    <string name="face_setup_title">Configurar faciana</string>
+    <string name="face_setup_summary">Para empregar a túa faciana para desbloquear a pantalla, precisarás:</string>
+    <string name="face_setup_add_face">Engade a túa faciana</string>
+    <string name="biometric_setup_backup_lock_method">Configurar un método secundario de desbloqueo</string>
+    <string name="biometric_setup_screen_lock_setup">Configurar o bloqueo da pantalla</string>
    <string name="sim_locale_changed">%1$s SIM detectado</string>
    <string name="settings_lockscreen_setup_title">Seleccionar o tipo de bloqueo da pantalla</string>
    <string name="settings_lockscreen_setup_details">Como quere bloquear a súa pantalla?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protexe o teu móbil</string>
    <string name="lockscreen_setup_summary"><b>Protexe o dispositivo</b> e solicitar un PIN, patrón ou contrasinal para desbloquear a pantalla</string>
    <string name="lockscreen_setup_screen_lock_setup">Configura</string>
+    <string name="intro_restore_title">Restaurar aplicacións e datos</string>
+    <string name="intro_restore_subtitle" product="tablet">Se tes unha copia de seguranza da túa última tableta con LineageOS, podes restaurala aquí.</string>
+    <string name="intro_restore_subtitle" product="default">Se tes unha copia de seguranza do teu último teléfono con LineageOS, podes restaurala aquí.</string>
+    <string name="intro_restore_button">Restaurar dende a copia de seguranza</string>
 </resources>
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">અનલૉક કરો</string>
    <string name="setup_device_locked">આ ડિવાઇસ ઉપયોગકર્તા દ્વારા લૉક કરવામાં આવી છે.</string>
    <string name="setup_device_locked_instructions"><i>આ ફીચર ઑફ/ઑન કરવા, કૃપા કરીને સેટિંગ્સ &gt; સિક્યોરિટી પર જાવ</i></string>
-    <string name="settings_fingerprint_setup_title">બૅકઅપ સ્ક્રીન લૉક ટાઇપ પસંદ કરો</string>
-    <string name="settings_fingerprint_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
+    <string name="settings_biometric_setup_title">બૅકઅપ સ્ક્રીન લૉક ટાઇપ પસંદ કરો</string>
+    <string name="settings_biometric_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
    <string name="fingerprint_setup_title">ફિંગરપ્રિન્ટ સેટઅપ</string>
    <string name="fingerprint_setup_summary">તમારી સ્ક્રીન અનલૉક કરવા માટે તમારા ફિંગરપ્રિન્ટ સેન્સરનો ઉપયોગ કરવા, તમારે આ કરવું જરૂરી છે:</string>
-    <string name="fingerprint_setup_backup_lock_method">સેકન્ડરિ અનલૉક પદ્ધતિ સેટઅપ કરો</string>
    <string name="fingerprint_setup_add_fingerprint">તમારી ફિંગરપ્રિન્ટ ઉમેરો</string>
-    <string name="fingerprint_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
+    <string name="biometric_setup_backup_lock_method">સેકન્ડરિ અનલૉક પદ્ધતિ સેટઅપ કરો</string>
+    <string name="biometric_setup_screen_lock_setup">સ્ક્રીન લૉક સેટઅપ કરો</string>
    <string name="sim_locale_changed">%1$s SIM સૂચિત</string>
    <string name="settings_lockscreen_setup_details">તમે કેવી રીતે તમારું સ્ક્રીન લૉક કરવા માંગો છો?</string>
    <string name="lockscreen_setup_title" product="default">તમારા ફોનને સુરક્ષિત કરો</string>
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -51,12 +51,12 @@
    <string name="setup_unlock">अनलॉक करें</string>
    <string name="setup_device_locked">इस उपकरण को उपयोगकर्ता ने लॉक किया है।</string>
    <string name="setup_device_locked_instructions"><i>इस सुविधा को बंद/चालू करने के लिए, कृपया सेटिंग &gt;सुरक्षा में जाएँ</i></string>
-    <string name="settings_fingerprint_setup_title">बैकअप स्क्रीन लॉक प्रकार चुनें</string>
-    <string name="settings_fingerprint_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
+    <string name="settings_biometric_setup_title">बैकअप स्क्रीन लॉक प्रकार चुनें</string>
+    <string name="settings_biometric_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
    <string name="fingerprint_setup_title">अँगुली छाप सेटअप</string>
    <string name="fingerprint_setup_summary">अपने स्क्रीन को अनॉक करने के वास्ते अपने उँगली छाप संवेदक का उपयोग करने के लिए, आपको यह करना होगा:</string>
-    <string name="fingerprint_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
    <string name="fingerprint_setup_add_fingerprint">अपनी अँगुली छाप जोड़ें</string>
-    <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
+    <string name="biometric_setup_backup_lock_method">अनलॉक करने की कोई दूसरी विधि भी सेट अप करें</string>
+    <string name="biometric_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करें</string>
    <string name="settings_lockscreen_setup_details">आप अपने स्क्रीन को किस तरह से लॉक करना चाहेंगे?</string>
 </resources>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">Želite li koristiti mobilne podatke tijekom postavljanja? Uključeni mobilni podaci mogu napraviti troškove.</string>
    <string name="no">Ne</string>
    <string name="yes">Da</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d </xliff:g> - <xliff:g id="name">%2$s </xliff:g></string>
    <string name="emergency_call">Hitan poziv</string>
    <string name="setup_services">Značajke LineageOS-a</string>
    <string name="services_explanation" product="tablet">Ove usluge rade za vas da povećaju mogućnosti vašeg tableta. Podatci će se upotrebljavati u suglasnosti s LineageOS-ovom <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
@@ -61,17 +62,25 @@
    <string name="setup_device_locked">Uređaj je zaključao korisnik.</string>
    <string name="setup_require_cyanogen_label"><b>Zahtijeva lozinku vašeg računa</b>za korištenje vašim uređajem čak i nakon vraćanja na tvorničke postavke.</string>
    <string name="setup_device_locked_instructions"><i>Da bi isključili/uključili ovo, idite u Postavke &gt; Privatnost</i></string>
-    <string name="settings_fingerprint_setup_title">Izaberite rezerni tip zaključavanja zaslona</string>
-    <string name="settings_fingerprint_setup_details">Kako želite zaključati vaš zaslon?</string>
+    <string name="settings_biometric_setup_title">Izaberite rezerni tip zaključavanja zaslona</string>
+    <string name="settings_biometric_setup_details">Kako želite zaključati vaš zaslon?</string>
    <string name="fingerprint_setup_title">Postavljanje otiska prsta</string>
    <string name="fingerprint_setup_summary">Da bi koristili senzor otiska prsta za otključavanje zaslona, trebate:</string>
-    <string name="fingerprint_setup_backup_lock_method">Postavljanje rezervne metode otključavanja</string>
    <string name="fingerprint_setup_add_fingerprint">Dodajte svoj otisak</string>
-    <string name="fingerprint_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
+    <string name="face_setup_title">Postavke lica</string>
+    <string name="face_setup_summary">Da bi koristili lice za otključavanje zaslona, trebate:</string>
+    <string name="face_setup_add_face">Dodajte vaše lice</string>
+    <string name="biometric_setup_backup_lock_method">Postavljanje rezervne metode otključavanja</string>
+    <string name="biometric_setup_screen_lock_setup">Postavljanje zaključavanja zaslona</string>
    <string name="sim_locale_changed">%1$s SIM otkriven</string>
    <string name="settings_lockscreen_setup_title">Odaberite vrstu zaključavanja zaslona</string>
    <string name="settings_lockscreen_setup_details">Kako želite zaključati vaš zaslon?</string>
+    <string name="lockscreen_setup_title" product="tablet">Zaštitite svoj tablet</string>
    <string name="lockscreen_setup_title" product="default">Zaštitite svoj telefon</string>
    <string name="lockscreen_setup_summary"><b>Zaštiti uređaj</b> i zahtijevaj PIN, uzorak ili zaporku za otključavanje zaslona</string>
    <string name="lockscreen_setup_screen_lock_setup">Postavljanje</string>
+    <string name="intro_restore_title">Vrati aplikacije i podatke</string>
+    <string name="intro_restore_subtitle" product="tablet">Ako imate sigurnosnu kopiju sa svog posljednjeg LineageOS tableta, možete je vratiti ovdje.</string>
+    <string name="intro_restore_subtitle" product="default">Ako imate sigurnosnu kopiju sa svog posljednjeg LineageOS teleona, možete je vratiti ovdje.</string>
+    <string name="intro_restore_button">Vrati podatke iz sigurnosne kopije</string>
 </resources>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Ezt az eszközt a felhasználó zárolta.</string>
    <string name="setup_require_cyanogen_label"><b>Fiókjának jelszava szükséges</b> a készülék használatához, még a gyári beállítások visszaállítása után is.</string>
    <string name="setup_device_locked_instructions"><i>A szolgáltatás ki/be kapcsolásához, kérjük menjen ide: Beállítások &gt; Biztonság</i></string>
-    <string name="settings_fingerprint_setup_title">Válasszon másodlagos feloldási módot</string>
-    <string name="settings_fingerprint_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
+    <string name="settings_biometric_setup_title">Válasszon másodlagos feloldási módot</string>
+    <string name="settings_biometric_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
    <string name="fingerprint_setup_title">Ujjlenyomat beállítások</string>
    <string name="fingerprint_setup_summary">Az ujjlenyomat érzékelő használatával történő képernyő zárolás feloldásához, a következőre van szüksége:</string>
-    <string name="fingerprint_setup_backup_lock_method">Másodlagos feloldási mód beállításai</string>
    <string name="fingerprint_setup_add_fingerprint">Adja hozzá ujjlenyomatát</string>
-    <string name="fingerprint_setup_screen_lock_setup">Képernyőzár beállítása</string>
+    <string name="face_setup_title">Arcbeállítások</string>
+    <string name="face_setup_summary">Az arcával történő képernyő-feloldásához, a következőkre van szüksége:</string>
+    <string name="face_setup_add_face">Az arcképe hozzá legyen rendelve a feloldáshoz</string>
+    <string name="biometric_setup_backup_lock_method">Másodlagos feloldási mód beállításai</string>
+    <string name="biometric_setup_screen_lock_setup">Képernyőzár beállítása</string>
    <string name="sim_locale_changed">%1$s SIM észlelve</string>
    <string name="settings_lockscreen_setup_title">Válasszon képernyő zárolási típust</string>
    <string name="settings_lockscreen_setup_details">Hogyan szeretné zárolni a képernyőt?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Óvja meg telefonját</string>
    <string name="lockscreen_setup_summary"><b>Óvja meg eszközét</b>, és a képernyőzár feloldásához állítson be PIN kódot, mintát vagy jelszót.</string>
    <string name="lockscreen_setup_screen_lock_setup">Beállítás</string>
+    <string name="intro_restore_title">Alkalmazások és adatok visszaállítása</string>
+    <string name="intro_restore_subtitle" product="tablet">Ha készült LineageOS mentés az előző tabletjéről, akkor azt itt visszaállíthatja.</string>
+    <string name="intro_restore_subtitle" product="default">Ha készült LineageOS mentés az előző telefonjáról, akkor azt itt visszaállíthatja.</string>
+    <string name="intro_restore_button">Visszaállítás biztonsági mentésből</string>
 </resources>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -22,12 +22,12 @@
    <string name="start">Mulai</string>
    <string name="done">Selesai</string>
    <string name="ok">OKE</string>
-    <string name="loading">Hanya sec\u2026</string>
+    <string name="loading">Harap tunggu\u2026</string>
    <string name="setup_complete">Penyiapan selesai</string>
    <string name="setup_welcome">Selamat datang</string>
    <string name="setup_locale">Bahasa</string>
    <string name="setup_wifi">Pilih Wi-Fi</string>
-    <string name="setup_sim_missing">SIM kartu hilang</string>
+    <string name="setup_sim_missing">Kartu SIM hilang</string>
    <string name="setup_choose_data_sim">Pilih SIM untuk Data</string>
    <string name="setup_location">Layanan lokasi</string>
    <string name="setup_other">Layanan lainnya</string>
@@ -57,23 +57,30 @@
    <string name="services_privacy_policy">Kebijakan privasi</string>
    <string name="services_help_improve_cm">Membantu meningkatkan <xliff:g id="name" example="LineageOS">%s </xliff:g></string>
    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> dengan mengirim data diagnostik dan penggunaan ke LineageOS secara otomatis. Informasi ini tidak dapat mengidentifikasi Anda, dan hanya berfungsi untuk membantu tim bekerja dengan hal-hal seperti masa pakai baterai, kinerja aplikasi, dan fitur <xliff:g id="name" example="LineageOS">%2$s</xliff:g> yang baru.</string>
-    <string name="services_os_nav_keys_label"><b>Digunakan pada tombol navigasi layar</b> bukan tombol perangkat keras.</string>
+    <string name="services_os_nav_keys_label"><b>Gunakan tombol navigasi pada layar</b> bukan tombol perangkat keras.</string>
    <string name="setup_unlock">Buka kunci</string>
    <string name="setup_device_locked">Perangkat ini telah dikunci oleh pengguna.</string>
    <string name="setup_require_cyanogen_label"><b>Memerlukan kata sandi akun anda</b> untuk dapat menggunakan perangkat meskipun setelah di setel ulang ke pengaturan pabrik.</string>
    <string name="setup_device_locked_instructions"><i>Untuk mengaktifkan/menonaktifkan fitur ini, silakan masuk ke Pengaturan &gt; Keamanan</i></string>
-    <string name="settings_fingerprint_setup_title">Pilih tipe kunci layar cadangan</string>
-    <string name="settings_fingerprint_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
+    <string name="settings_biometric_setup_title">Pilih tipe kunci layar cadangan</string>
+    <string name="settings_biometric_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
    <string name="fingerprint_setup_title">Penyiapan sidik jari</string>
    <string name="fingerprint_setup_summary">Untuk menggunakan sensor sidik jari untuk membuka layar, Anda perlu:</string>
-    <string name="fingerprint_setup_backup_lock_method">Siapkan metode buka kunci kedua</string>
    <string name="fingerprint_setup_add_fingerprint">Tambahkan sidik jari Anda</string>
-    <string name="fingerprint_setup_screen_lock_setup">Siapkan kunci layar</string>
+    <string name="face_setup_title">Penyiapan wajah</string>
+    <string name="face_setup_summary">Untuk membuka kunci layar dengan wajah Anda, Anda perlu:</string>
+    <string name="face_setup_add_face">Tambahkan wajah Anda</string>
+    <string name="biometric_setup_backup_lock_method">Siapkan metode buka kunci kedua</string>
+    <string name="biometric_setup_screen_lock_setup">Siapkan kunci layar</string>
    <string name="sim_locale_changed">%1$s SIM terdeteksi</string>
    <string name="settings_lockscreen_setup_title">Pilih tipe kunci layar</string>
    <string name="settings_lockscreen_setup_details">Bagaimana cara kunci layar yang Anda suka?</string>
    <string name="lockscreen_setup_title" product="tablet">Lindungi tablet Anda</string>
    <string name="lockscreen_setup_title" product="default">Lindungi telepon anda</string>
-    <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau sandi untuk membuka kunci layar</string>
+    <string name="lockscreen_setup_summary"><b>Lindungi perangkat ini</b> dan minta PIN, pola, atau kata sandi untuk membuka kunci layar</string>
    <string name="lockscreen_setup_screen_lock_setup">Menyiapkan</string>
+    <string name="intro_restore_title">Pulihkan aplikasi dan data</string>
+    <string name="intro_restore_subtitle" product="tablet">Jika Anda memiliki cadangan dari LineageOS terakhir pada tablet Anda, Anda dapat memulihkannya di sini.</string>
+    <string name="intro_restore_subtitle" product="default">Jika Anda memiliki cadangan dari LineageOS terakhir pada ponsel Anda, Anda dapat memulihkannya di sini.</string>
+    <string name="intro_restore_button">Pulihkan dari cadangan</string>
 </resources>
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -16,10 +16,72 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Uppsetningarleiðarvísir</string>
+    <string name="next">Næsta</string>
+    <string name="skip">Sleppa</string>
+    <string name="start">Byrja</string>
+    <string name="done">Lokið</string>
+    <string name="ok">Í lagi</string>
+    <string name="loading">Bíddu aðeins\u2026</string>
+    <string name="setup_complete">Uppsetningu er lokið</string>
+    <string name="setup_welcome">Velkomin</string>
+    <string name="setup_locale">Tungumál</string>
+    <string name="setup_wifi">Veldu Wi-Fi-net</string>
+    <string name="setup_sim_missing">SIM-kortið vantar</string>
+    <string name="setup_choose_data_sim">Veldu SIM-kort undir gögn</string>
+    <string name="setup_location">Staðsetningarþjónustur</string>
+    <string name="setup_other">Aðrar þjónustur</string>
+    <string name="setup_datetime">Dagsetning og tími</string>
+    <string name="setup_current_date">Núverandi dagsetning</string>
+    <string name="setup_current_time">Núverandi tími</string>
+    <string name="sim_missing_summary" product="tablet">SIM-kort fannst ekki í spjaldtölvunni þinni. Til að setja inn SIM-kort skaltu lesa leiðbeiningarnar sem komu með tækinu þínu.</string>
+    <string name="sim_missing_summary" product="default">SIM-kort fannst ekki í símanum þínum. Til að setja inn SIM-kort skaltu lesa leiðbeiningarnar sem komu með tækinu þínu.</string>
+    <string name="choose_data_sim_summary" product="tablet">Hvaða SIM-kort viltu nota undir gögn? Valda SIM-kortið gæti valdið útgjöldum vegna netsambands þar sem það verður notað til að setja upp spjaldtölvuna þína.</string>
+    <string name="choose_data_sim_summary" product="default">Hvaða SIM-kort viltu nota undir gögn? Valda SIM-kortið gæti valdið útgjöldum vegna netsambands þar sem það verður notað til að setja upp símann þinn.</string>
+    <string name="date_time_summary">Settu tímabeltið þitt og lagaðu núverandi dags- og tímasetningu ef þörf krefur</string>
+    <string name="backup_data_summary">Vistaðu <b>öryggisafrit</b> af gögnum forrita, Wi-Fi aðgangsorðum og öðrum 
+stillingum á þjóna Google</string>
+    <string name="other_services_summary">Þessar þjónustur reiða sig á Google, þú getur kveikt eða slökkt á þeim hvenær sem er. Gögn verða notuð í samræmi við <xliff:g id="name" example="Privacy Policy">%s</xliff:g> hjá Google.</string>
+    <string name="location_services_summary">Staðsetningarþjónustur gera kerfinu og utanaðkomandi forritum kleift að safna og nota gögn á borð við áætlaða staðsetningu þína. Sem dæmi, forrit gæti notað áætlaða staðsetningu þína til að finna nálæg kaffihús.</string>
+    <string name="location_access_summary"><b>Leyfa forrit sem hafa beðið um heimild þína</b> til að nota staðsetningarupplýsingar. Þetta gæti falið í sér aðgang að upplýsingum um núverandi jafnt sem fyrri staðsetningar.</string>
    <string name="setup_mobile_data">Kveiktu á farsímagögnum</string>
+    <string name="setup_mobile_data_no_service">Engin þjónusta</string>
+    <string name="setup_mobile_data_emergency_only">Einungis neyðarsímtöl</string>
+    <string name="enable_mobile_data_summary">Viltu nota farsímagögn á meðan uppsetningu stendur? Sé kveikt á farsímagögnum getur það haft aukakostnað í för með sér.</string>
+    <string name="no">Nei</string>
+    <string name="yes">Já</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">Neyðarsímtal</string>
+    <string name="setup_services">Eiginleikar LineageOS</string>
    <string name="services_explanation" product="tablet">Þessar þjónustur gera þér kleift að útvíkka eiginleika spjaldtölvunnar þinnar. Gögn verða notuð í samræmi við <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
    <string name="services_explanation" product="default">Þessar þjónustur gera þér kleift að útvíkka eiginleika símans þíns. Gögn verða notuð í samræmi við <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
+    <string name="services_privacy_policy">Meðferð persónuupplýsinga</string>
+    <string name="services_help_improve_cm">Hjálpaðu okkur að bæta <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Hjálpaðu til við að bæta LineageOS">%1$s</xliff:g> með því að senda sjálfvirkt greiningargögn og upplýsingar um notkun til LineageOS. Þessar upplýsingar er ekki hægt að nota til að auðkenna þig og hjálpa þróunarteymum við vinnu varðandi ýmis atriði, eins og líftíma rafhlöðu, afköst forrita og nýja eiginleika í <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
    <string name="services_os_nav_keys_label"><b>Nota leiðsagnarlykla á skjánum</b> í stað vélbúnaðarhnappa.</string>
+    <string name="setup_unlock">Aflæsa</string>
    <string name="setup_device_locked">Þessu tæki hefur verið læst af notandanum.</string>
+    <string name="setup_require_cyanogen_label"><b>Krefjast lykilorðs að aðgangnum þinum</b> til að geta notað tækið þitt, jafnvel eftir endurstillingu á verksmiðjustillingar.</string>
    <string name="setup_device_locked_instructions"><i>Til að kveikja eða slökkva á þessum eiginleika, farðu í Stillingar &gt; Öryggi</i></string>
+    <string name="settings_biometric_setup_title">Veldu gerð skjálæsingar til vara</string>
+    <string name="settings_biometric_setup_details">Hvernig viltu læsa skjánum þínum?</string>
+    <string name="fingerprint_setup_title">Uppsetning fingrafaraskanna</string>
+    <string name="fingerprint_setup_summary">Til að nota fingrafaraskanna til að aflæsa skjánum, þarftu að:</string>
+    <string name="fingerprint_setup_add_fingerprint">Bættu við fingrafarinu þínu</string>
+    <string name="face_setup_title">Uppsetning andlitskennsla</string>
+    <string name="face_setup_summary">Til að nota andlitaskanna til að aflæsa skjánum, þarftu að:</string>
+    <string name="face_setup_add_face">Bæta við andlitinu þínu</string>
+    <string name="biometric_setup_backup_lock_method">Settu upp aðra aðferð til að aflæsa</string>
+    <string name="biometric_setup_screen_lock_setup">Setja upp skjálæsingu</string>
+    <string name="sim_locale_changed">Fann %1$s SIM-kort</string>
+    <string name="settings_lockscreen_setup_title">Veldu gerð skjálæsingar</string>
+    <string name="settings_lockscreen_setup_details">Hvernig viltu læsa skjánum þínum?</string>
+    <string name="lockscreen_setup_title" product="tablet">Verndaðu spjaldtölvuna þína</string>
+    <string name="lockscreen_setup_title" product="default">Verndaðu símann þinn</string>
+    <string name="lockscreen_setup_summary"><b>Verndaðu tækið</b> og krefstu þess að sett sé inn PIN-númer, mynstur eða lykilorð til að aflæsa skjánum</string>
+    <string name="lockscreen_setup_screen_lock_setup">Setja upp</string>
+    <string name="intro_restore_title">Endurheimta forrit og gögn</string>
+    <string name="intro_restore_subtitle" product="tablet">Ef þú ert með öryggisafrit af síðustu LineageOS-spjaldtölvunni þinni, þá geturðu endurheimt það hér.</string>
+    <string name="intro_restore_subtitle" product="default">Ef þú ert með öryggisafrit af síðasta LineageOS-símanum þínum, þá geturðu endurheimt það hér.</string>
+    <string name="intro_restore_button">Endurheimta úr öryggisafriti</string>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Questo dispositivo è stato bloccato dall\'utente.</string>
    <string name="setup_require_cyanogen_label"><b>È necessaria la password del tuo account</b> al fine di utilizzare il dispositivo anche dopo il ripristino di fabbrica.</string>
    <string name="setup_device_locked_instructions"><i>Per attivare e disattivare questa funzione, vai in Impostazioni &gt; Sicurezza</i></string>
-    <string name="settings_fingerprint_setup_title">Seleziona la schermata di sicurezza di riserva</string>
-    <string name="settings_fingerprint_setup_details">Come vuoi bloccare lo schermo?</string>
+    <string name="settings_biometric_setup_title">Seleziona la schermata di sicurezza di riserva</string>
+    <string name="settings_biometric_setup_details">Come vuoi bloccare lo schermo?</string>
    <string name="fingerprint_setup_title">Setup impronte digitali</string>
    <string name="fingerprint_setup_summary">Per usare le impronte digitali per sbloccare lo schermo, avrai bisogno di:</string>
-    <string name="fingerprint_setup_backup_lock_method">Impostare un metodo di sblocco secondario</string>
    <string name="fingerprint_setup_add_fingerprint">Aggiungere un\'impronta</string>
-    <string name="fingerprint_setup_screen_lock_setup">Imposta un blocco schermo</string>
+    <string name="face_setup_title">Configurazione volto</string>
+    <string name="face_setup_summary">Per utilizzare il tuo volto per sbloccare lo schermo, avrai bisogno di:</string>
+    <string name="face_setup_add_face">Registrare il tuo volto</string>
+    <string name="biometric_setup_backup_lock_method">Impostare un metodo di sblocco secondario</string>
+    <string name="biometric_setup_screen_lock_setup">Imposta un blocco schermo</string>
    <string name="sim_locale_changed">%1$s SIM rilevata</string>
    <string name="settings_lockscreen_setup_title">Seleziona il tipo di blocco schermo</string>
    <string name="settings_lockscreen_setup_details">Come vuoi bloccare lo schermo?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Proteggi il tuo telefono</string>
    <string name="lockscreen_setup_summary"><b>Proteggi il dispositivo</b> e richiedi PIN, sequenza o password per sbloccare schermo</string>
    <string name="lockscreen_setup_screen_lock_setup">Configura</string>
+    <string name="intro_restore_title">Ripristina app e dati</string>
+    <string name="intro_restore_subtitle" product="tablet">Se disponi di un backup da un altro tablet con LineageOS, puoi ripristinarlo qui.</string>
+    <string name="intro_restore_subtitle" product="default">Se disponi di un backup da un altro telefono con LineageOS, puoi ripristinarlo qui.</string>
+    <string name="intro_restore_button">Ripristina dal backup</string>
 </resources>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -61,13 +61,13 @@
    <string name="setup_device_locked">מכשיר זה ננעל על-ידי המשתמש.</string>
    <string name="setup_require_cyanogen_label"><b>דרוש את סיסמת החשבון שלך</b> כדי להשתמש במכשיר אפילו לאחר איפוס מלא.</string>
    <string name="setup_device_locked_instructions"><i>כדי להפעיל/לכבות אפשרות זו, גש להגדרות &gt; אבטחה</i></string>
-    <string name="settings_fingerprint_setup_title">בחר סוג שיטת נעילת מסך לגיבוי</string>
-    <string name="settings_fingerprint_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
+    <string name="settings_biometric_setup_title">בחר סוג שיטת נעילת מסך לגיבוי</string>
+    <string name="settings_biometric_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
    <string name="fingerprint_setup_title">הגדרת טביעת אצבע</string>
    <string name="fingerprint_setup_summary">כדי להשתמש בחיישן טביעות האצבע שלך, עליך:</string>
-    <string name="fingerprint_setup_backup_lock_method">הגדר שיטת פתיחה משנית</string>
    <string name="fingerprint_setup_add_fingerprint">הוסף את טביעת האצבע שלך</string>
-    <string name="fingerprint_setup_screen_lock_setup">הגדרת מסך נעילה</string>
+    <string name="biometric_setup_backup_lock_method">הגדר שיטת פתיחה משנית</string>
+    <string name="biometric_setup_screen_lock_setup">הגדרת מסך נעילה</string>
    <string name="sim_locale_changed">זוהו %1$s כרטיסי SIM</string>
    <string name="settings_lockscreen_setup_title">בחר סוג נעילת מסך</string>
    <string name="settings_lockscreen_setup_details">כיצד הנך מעוניין לנעול את המסך שלך?</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">セットアップ中にモバイルデータを使用しますか？モバイルデータをONにすると、パケット通信料を請求される可能性があります。</string>
    <string name="no">いいえ</string>
    <string name="yes">はい</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">緊急通報</string>
    <string name="setup_services">LineageOS の機能</string>
    <string name="services_explanation" product="tablet">これらのサービスは端末の機能を拡張するために動作します。データは LineageOS の<xliff:g id="name" example="Privacy Policy">%s</xliff:g>に従って使用されます。</string>
@@ -61,17 +62,25 @@
    <string name="setup_device_locked">この端末はユーザーによってロックされています。</string>
    <string name="setup_require_cyanogen_label">工場出荷時の状態にリセットした後でも、この端末を使用するには<b>アカウントのパスワードの入力が必要です</b>。</string>
    <string name="setup_device_locked_instructions"><i>この機能をOFF/ONするには、設定→プライバシーを開いてください</i></string>
-    <string name="settings_fingerprint_setup_title">予備の画面のロックの種類を選択</string>
-    <string name="settings_fingerprint_setup_details">どのように画面をロックしますか？</string>
+    <string name="settings_biometric_setup_title">予備の画面のロックの種類を選択</string>
+    <string name="settings_biometric_setup_details">どのように画面をロックしますか？</string>
    <string name="fingerprint_setup_title">指紋のセットアップ</string>
    <string name="fingerprint_setup_summary">指紋センターを画面のロック解除に使用するには、以下のことを行う必要があります:</string>
-    <string name="fingerprint_setup_backup_lock_method">予備のロック解除方法をセットアップ</string>
    <string name="fingerprint_setup_add_fingerprint">指紋を追加</string>
-    <string name="fingerprint_setup_screen_lock_setup">画面のロックをセットアップ</string>
+    <string name="face_setup_title">顔認証の設定</string>
+    <string name="face_setup_summary">顔認証を画面のロック解除に使用するには、以下のことを行う必要があります:</string>
+    <string name="face_setup_add_face">顔を追加</string>
+    <string name="biometric_setup_backup_lock_method">予備のロック解除方法をセットアップ</string>
+    <string name="biometric_setup_screen_lock_setup">画面のロックをセットアップ</string>
    <string name="sim_locale_changed">%1$sのSIMを検出しました</string>
    <string name="settings_lockscreen_setup_title">画面のロックの種類を選択</string>
    <string name="settings_lockscreen_setup_details">どのように画面をロックしますか？</string>
+    <string name="lockscreen_setup_title" product="tablet">タブレットの保護</string>
    <string name="lockscreen_setup_title" product="default">スマートフォンの保護</string>
    <string name="lockscreen_setup_summary"><b>この端末を保護</b>し、画面のロック解除にPIN、パターン、またはパスワードを必要とする</string>
    <string name="lockscreen_setup_screen_lock_setup">セットアップ</string>
+    <string name="intro_restore_title">アプリとデータを復元</string>
+    <string name="intro_restore_subtitle" product="tablet">以前の LineageOS タブレットからのバックアップがある場合は、こちらから復元できます。</string>
+    <string name="intro_restore_subtitle" product="default">以前の LineageOS スマートフォンからのバックアップがある場合は、こちらから復元できます。</string>
+    <string name="intro_restore_button">バックアップから復元</string>
 </resources>
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -17,34 +17,70 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">გამართვის მეგზური</string>
+    <string name="next">შემდეგი</string>
+    <string name="skip">გამოტოვება</string>
+    <string name="start">დაწყება</string>
+    <string name="done">მზადაა</string>
    <string name="ok">კარგი</string>
+    <string name="loading">ერთი წამით\u2026</string>
    <string name="setup_complete">გამართვა დასრულებულია</string>
    <string name="setup_welcome">მოგესალმებით</string>
-    <string name="setup_wifi">აირჩიეთ Wi-Fi</string>
-    <string name="setup_sim_missing">SIM-ბარათი მიუწვდომელია</string>
+    <string name="setup_locale">ენა</string>
+    <string name="setup_wifi">აირჩიეთ WiFi</string>
+    <string name="setup_sim_missing">SIM-ბარათი ამოკლებულია</string>
    <string name="setup_choose_data_sim">აირჩიეთ SIM ინტერნეტისთვის</string>
    <string name="setup_location">მდებარეობის მომსახურებები</string>
    <string name="setup_other">სხვა მომსახურებები</string>
    <string name="setup_datetime">თარიღი და დრო</string>
    <string name="setup_current_date">მიმდინარე თარიღი</string>
    <string name="setup_current_time">მიმდინარე დრო</string>
+    <string name="sim_missing_summary" product="tablet">SIM-ბარათი არაა აღმოჩენილი თქვენს პლანშეტში. SIM-ბარათის სწორად ჩასადებად, იხილეთ მოწყობილობის თანმხლები სახელმძღვანელო.</string>
+    <string name="sim_missing_summary" product="default">SIM-ბარათი არაა აღმოჩენილი თქვენს ტელეფონში. SIM-ბარათის სწორად ჩასადებად, იხილეთ მოწყობილობის თანმხლები სახელმძღვანელო.</string>
+    <string name="choose_data_sim_summary" product="tablet">რომელი SIM-ბარათის გამოყენება გსურთ მობილური ინტერნეტისთვის? შერჩეულ SIM-ბარათზე, შესაძლოა თანხა ჩამოგეჭრათ, პლანშეტის გასამართად გამოყენებისას.</string>
+    <string name="choose_data_sim_summary" product="default">რომელი SIM-ბარათის გამოყენება გსურთ მობილური ინტერნეტისთვის? შერჩეულ SIM-ბარათზე, შესაძლოა თანხა ჩამოგეჭრათ, ტელეფონის გასამართად გამოყენებისას.</string>
+    <string name="date_time_summary">სასაათე სარტყლის დაყენება, დროისა და თარიღის საჭიროებისამებრ გასწორება</string>
+    <string name="backup_data_summary"><b>დაამარქაფებს</b> აპის მონაცემებს, WiFi-ს პაროლებსა და სხვა პარამეტრებს Google-სერვერზე</string>
+    <string name="other_services_summary">ამ მომსახურებების მუშაობას უზრუნველყოფს Google და შეგიძლიათ ნებისმიერ დროს ჩართოთ ან გამორთოთ. მონაცემთა გამოყენების პირობებს განსაზღვრავს Google-ის <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="location_services_summary">მდებარეობის მომსახურების მეშვეობით სისტემასა და გარეშე პროგრამებს შეუძლია შეაგროვოს და გამოიყენოს თქვენი მიახლოებითი ადგილმდებარეობის მონაცემები. მაგალითად, ამის საფუძველზე ზოგი პროგრამა გაპოვნინებთ ახლომდებარე კაფეებს.</string>
+    <string name="location_access_summary"><b>ნების დართვა იმ აპებისთვის, რომელთაც ითხოვეს</b> თქვენი მდებარეობის მონაცემთა გამოყენების უფლება. შესაძლოა მოიცავდეს როგორც მიმდინარე, ასევე წარსული მდებარეობის მონაცემებსაც.</string>
    <string name="setup_mobile_data">ფიჭური ინტერნეტის ჩართვა</string>
    <string name="setup_mobile_data_no_service">მომსახურება არაა</string>
    <string name="setup_mobile_data_emergency_only">მხოლოდ საგანგებო ზარები</string>
    <string name="enable_mobile_data_summary">გსურთ გამართვისას, ფიჭური ინტერნეტის გამოყენება? ფიჭური ინტერნეტის ჩართვის შედეგად, შესაძლოა თანხა ჩამოგეჭრათ.</string>
    <string name="no">არა</string>
+    <string name="yes">დიახ</string>
    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">საგანგებო ზარი</string>
+    <string name="setup_services">LineageOS-ს შესაძლებლობები</string>
+    <string name="services_explanation" product="tablet">ამ მომსახურებების მუშაობა აფართოებს თქვენი პლანშეტის შესაძლებლობებს. მონაცემებით სარგებლობის პირობებს განსაზღვრავს LineageOS-ის <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_explanation" product="default">ამ მომსახურებების მუშაობა აფართოებს თქვენი ტელეფონის შესაძლებლობებს. მონაცემებით სარგებლობის პირობებს განსაზღვრავს LineageOS-ის <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_privacy_policy">პირადულობის დებულება</string>
+    <string name="services_help_improve_cm">დაგვეხმარეთ, გავაუმჯობესოთ <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> იმ საკვლევი და გამოყენების მონაცემთა ავტომატური გაგზავნით, რომელთაც გაეცნობა LineageOS. ეს მონაცემები არ გამოდგება თქვენი ვინაობის დასადგენად, სამაგიეროდ ხელს გაუმართავს შემმუშავებლებს, რომ დახვეწონ ბატარეის მოხმარება, გაზარდონ აპების წარმადობა და გააუმჯობესონ <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ახალი შესაძლებლობებით.</string>
+    <string name="services_os_nav_keys_label"><b>ეკრანული ღილაკების გამოყენება სამოძრაოდ</b> ფიზიკურის ნაცვლად.</string>
    <string name="setup_unlock">გახსნა</string>
    <string name="setup_device_locked">მოწყობილობა ჩაკეტა მომხმარებლმა.</string>
+    <string name="setup_require_cyanogen_label"><b>მოითხოვს თქვენი ანგარიშის პაროლს</b> მოწყობილობის გამოსაყენებლად, ქარხნულზე დაბრუნების შემდგომაც.</string>
    <string name="setup_device_locked_instructions"><i>ამ შესაძლებლობის ჩართვა/გამორთვისთვის, გთხოვთ იხილოთ პარამეტრები &gt; უსაფრთხოება</i></string>
-    <string name="settings_fingerprint_setup_details">როგორ გსურთ ეკრანის ჩაკეტვა?</string>
+    <string name="settings_biometric_setup_title">ეკრანის სათადარიგო ჩამკეტის სახეობის არჩევა</string>
+    <string name="settings_biometric_setup_details">როგორ გსურთ ეკრანის ჩაკეტვა?</string>
    <string name="fingerprint_setup_title">თითის ანაბეჭდის გამართვა</string>
-    <string name="fingerprint_setup_summary">თითის ანაბეჭდის აღმქმელის ეკრანის გასახსნელად გამოყენებისთვის, დაგჭირდებათ:</string>
-    <string name="fingerprint_setup_backup_lock_method">გასახსნელად დამატებითი საშუალების დაყენება</string>
+    <string name="fingerprint_setup_summary">თითის ანაბეჭდით ეკრანის გასახსნელად დაგჭირდებათ:</string>
    <string name="fingerprint_setup_add_fingerprint">თითის ანაბეჭდის დამატება</string>
-    <string name="fingerprint_setup_screen_lock_setup">ეკრანის ჩაკეტვის გამართვა</string>
+    <string name="face_setup_title">სახის ამოცნობა</string>
+    <string name="face_setup_summary">სახის ამოცნობით ეკრანის გასახსნელად დაგჭირდებათ:</string>
+    <string name="face_setup_add_face">სახის დამატება</string>
+    <string name="biometric_setup_backup_lock_method">გასახსნელად დამატებითი საშუალების დაყენება</string>
+    <string name="biometric_setup_screen_lock_setup">ეკრანის ჩაკეტვის გამართვა</string>
+    <string name="sim_locale_changed">%1$s SIM-ბარათია აღმოჩენილი</string>
    <string name="settings_lockscreen_setup_title">ეკრანის ჩამკეტის სახეობის არჩევა</string>
    <string name="settings_lockscreen_setup_details">როგორ გსურთ ეკრანის ჩაკეტვა?</string>
+    <string name="lockscreen_setup_title" product="tablet">დაიცავით თქვენი პლანშეტი</string>
    <string name="lockscreen_setup_title" product="default">დაიცავით თქვენი ტელეფონი</string>
    <string name="lockscreen_setup_summary"><b>დაიცავით მოწყობილობა</b> და ჩართეთ PIN-კოდის, მონახაზის ან პაროლის შეყვანის მოთხოვნა, ჩაკეტილი ეკრანის გასახსნელად</string>
+    <string name="lockscreen_setup_screen_lock_setup">გამართვა</string>
+    <string name="intro_restore_title">აპებისა და მონაცემების აღდგენა</string>
+    <string name="intro_restore_subtitle" product="tablet">თუ თქვენი წინა LineageOS-პლანშეტის სამარქაფო ასლი გაქვთ, აქედან შეძლებთ აღდგენას.</string>
+    <string name="intro_restore_subtitle" product="default">თუ თქვენი წინა LineageOS-ტელეფონის სამარქაფო ასლი გაქვთ, აქედან შეძლებთ აღდგენას.</string>
+    <string name="intro_restore_button">აღდგენა მარქაფიდან</string>
 </resources>
--- a/res/values-kab-rDZ/strings.xml
+++ b/res/values-kab-rDZ/strings.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="next">Ɣer zdat</string>
+    <string name="skip">Zgel</string>
+    <string name="start">Bdu</string>
+    <string name="done">Immed</string>
+    <string name="ok">IH</string>
+    <string name="loading">Yiwet tasint kan\u2026</string>
+    <string name="setup_complete">Ifukk usbadu</string>
+    <string name="setup_welcome">Anṣuf</string>
+    <string name="setup_locale">Tutlayt</string>
+    <string name="setup_wifi">Fren Wi-Fi</string>
+    <string name="setup_sim_missing">Ulac takarḍa n SIM</string>
+    <string name="setup_choose_data_sim">Fren takarḍa n SIM i-ysefka</string>
+    <string name="setup_location">Imeẓla n wadigg</string>
+    <string name="setup_other">Imeẓla nniḍen</string>
+    <string name="setup_datetime">Azemz d wakud</string>
+    <string name="setup_current_date">Azemz amiran</string>
+    <string name="setup_current_time">Akud amiran</string>
+    <string name="setup_mobile_data">Rmed isefka izirazen</string>
+    <string name="setup_mobile_data_no_service">Ulac ameẓlu</string>
+    <string name="setup_mobile_data_emergency_only">Isawalen uɛjilen kan</string>
+    <string name="no">Ala</string>
+    <string name="yes">Ih</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">Isawalen uɛjilen</string>
+    <string name="setup_services">Timahilin n LineageOS</string>
+    <string name="services_explanation" product="tablet">Tawuri n ymeẓliyen-a d asiɣzef n tzemmar n tfelwit-ik.im n uselkim. Isefka ad ttwasqedcen ilmend n usaḍuf n LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_explanation" product="default">Tawuri n ymeẓliyen-a d asiɣzef n tzemmar n tiliɣri-k.m. Isefka ad ttwasqedcen ilmend n usaḍuf n LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="services_privacy_policy">Tasertit tabaḍnit</string>
+    <string name="services_help_improve_cm">Muddet afus ad innerni <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="setup_unlock">Serreḥ</string>
+    <string name="setup_require_cyanogen_label"><b>Yessutur awal uffir n umiḍan-ik.im</b> iwakken ad iseqdec ibenk-ik.im ulamma deffir u wallus n uwennez n tkebbanit.</string>
+    <string name="settings_biometric_setup_details">Amek tebγiḍ ad tzekkwreḍ agdil-ik?</string>
+    <string name="fingerprint_setup_title">Asbadu n udsil umḍin</string>
+    <string name="fingerprint_setup_add_fingerprint">Rnu adsil umdin-ik</string>
+    <string name="sim_locale_changed">SIM %1$s tella</string>
+    <string name="settings_lockscreen_setup_details">Amek tebγiḍ ad tzekkwreḍ agdil-ik?</string>
+    <string name="lockscreen_setup_title" product="default">Mmesten tiliɣri-ik</string>
+    <string name="lockscreen_setup_screen_lock_setup">Sebded</string>
+</resources>
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -20,50 +20,54 @@
    <string name="next">ಮುಂದೆ</string>
    <string name="skip">ಸ್ಕಿಪ್</string>
    <string name="start">ಪ್ರಾರಂಭಿಸಿ</string>
+    <string name="done">ಆಯ್ತು</string>
    <string name="ok">ಆಯ್ತು</string>
-    <string name="loading">ಒಂದೇ ಒಂದು ಕ್ಷಣ\u2026</string>
+    <string name="loading">ಒಂದು ಕ್ಷಣದಲ್ಲಿ\u2026</string>
    <string name="setup_complete">ಸೆಟಪ್ ಪೂರ್ಣಗೊಂಡಿದೆ</string>
    <string name="setup_welcome">ಸುಸ್ವಾಗತ</string>
+    <string name="setup_locale">ಭಾಷೆ</string>
    <string name="setup_wifi">ವೈ-ಫೈ ಆಯ್ಕೆಮಾಡಿ</string>
    <string name="setup_sim_missing">ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ</string>
-    <string name="setup_choose_data_sim">ಡೇಟಾಗಾಗಿ ಒಂದು ಸಿಮ್ ಆರಿಸಿ</string>
+    <string name="setup_choose_data_sim">ದತ್ತಾಂಶಕ್ಕೊಂದು SIM ಆರಿಸು</string>
    <string name="setup_location">ಸ್ಥಳ ಸೇವೇಗಳು</string>
    <string name="setup_other">ಇತರೆ ಸೇವೆಗಳು</string>
    <string name="setup_datetime">ದಿನಾಂಕ &amp; ಸಮಯ</string>
    <string name="setup_current_date">ಪ್ರಸ್ತುತ ದಿನಾಂಕ</string>
    <string name="setup_current_time">ಪ್ರಸ್ತುತ ಸಮಯ</string>
-    <string name="sim_missing_summary" product="tablet">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
-    <string name="sim_missing_summary" product="default">ನಿಮ್ಮ ಫೋನ್‍ನಲ್ಲಿ ಸಿಮ್ ಕಾರ್ಡ್ ಪತ್ತೆಯಾಗಿಲ್ಲ. ಸಿಮ್‍ ಕಾರ್ಡ್ ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಸೂಚನೆಗಳನ್ನು ಓದಿ.</string>
+    <string name="sim_missing_summary" product="tablet">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನಲ್ಲಿ SIM ಪತ್ತೆಯಾಗಿಲ್ಲ. SIM ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಆದೇಶಗಳನ್ನು ಓದಿ.</string>
+    <string name="sim_missing_summary" product="default">ನಿಮ್ಮ ಫೋನ್ನಲ್ಲಿ SIM ಪತ್ತೆಯಾಗಿಲ್ಲ. SIM ಅಳವಡಿಸಲು, ನಿಮ್ಮ ಸಾಧನದೊಂದಿಗೆ ಬಂದಿರುವ ಆದೇಶಗಳನ್ನು ಓದಿ.</string>
    <string name="choose_data_sim_summary" product="tablet">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
    <string name="choose_data_sim_summary" product="default">ನೀವು ಡೇಟಾಗಾಗಿ ಯಾವ ಸಿಮ್ ಉಪಯೋಗಿಸಲು ಬಯಸುವಿರಿ? ಆಯ್ಕೆಮಾಡಿರುವ ಸಿಮ್ ನೆಟ್‍ವರ್ಕ್ ಶುಲ್ಕಗಳಿಗೆ ಗುರಿಯಾಗಬಹುದು ಏಕೆಂದರೆ ನಿಮ್ಮ ಫೋನನ್ನು ಸೆಟಪ್ ಮಾಡಲು ಇದನ್ನು ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
    <string name="date_time_summary">ಅಗತ್ಯವಿದ್ದಲ್ಲಿ ನಿಮ್ಮ ಸಮಯ ವಲಯವನ್ನು ಹಾಗು ಪ್ರಸ್ತುತ ದಿನಾಂಕ ಮತ್ತು ಗಂಟೆಯನ್ನು ಹೊಂದಿಸಿ</string>
-    <string name="backup_data_summary">ಆಪ್ ಡೇಟಾ, ವೈ-ಫೈ ಪ್ರವೇಶಪದಗಳು, ಮತ್ತು ಇತರೆ ಸೆಟ್ಟಿಂಗ್‍ಗಳನ್ನು ಗೂಗಲ್ ಸರ್ವರ್‍ಗಳಿಗೆ <b>ಬ್ಯಾಕ್ಅಪ್</b> ಮಾಡು</string>
+    <string name="backup_data_summary">ಆಪ್ ದತ್ತಾಂಶ, Wi-Fi ಪ್ರವೇಶಪದಗಳು, ಮತ್ತು ಇತರೆ ಅಳವಡಿಕೆಗಳನ್ನು ಗೂಗಲ್ ಪರಿಚಾರಕಗಳಲ್ಲಿ <b>ಬ್ಯಾಕ್ಅಪ್</b> ಮಾಡು</string>
    <string name="other_services_summary">ಈ ಸೇವೆಗಳು ಗೂಗಲನ್ನು ನಿಮ್ಮ ಸೇವೆಗೆ ನಿಯೋಜಿಸುತ್ತದೆ, ಹಾಗು ನೀವು ಅವುಗಳ್ಳನ್ನು ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಆನ್ ಅಥವ ಆಫ್ ಮಾಡಬಹುದು. ಡೇಟಾವನ್ನು ಗೂಗಲ್‍ನ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> ಅನುಸಾರವಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ.</string>
    <string name="location_services_summary">ಸ್ಥಳ ಸೇವೆಗಳು ಸಿಸ್ಟಂ ಹಾಗು ತೃತೀಯ ಪಕ್ಷೀಯ ಆಪ್‍ಗಳಿಗೆ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳದಂತಹ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲು ಮತ್ತು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ಒಂದು ಆಪ್ ನಿಮ್ಮ ಅಂದಾಜು ಸ್ಥಳವನ್ನು ಹತ್ತಿರದ ಕಾಫಿ ಶಾಪ್‍ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಉಪಯೋಗಿಸಬಹುದು.</string>
    <string name="location_access_summary"><b>ನಿಮ್ಮ ಅನುಮತಿಗಳನ್ನು ಕೇಳಿರುವ ಆಪ್‍ಗಳಿಗೆ</b> ನಿಮ್ಮ ಸ್ಥಳದ ಮಾಹಿತಿಯನ್ನು ಉಪಯೋಗಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಇದು ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಸ್ಥಳ ಮತ್ತು ಹಿಂದಿನ ಸ್ಥಳಗಳನ್ನೂ ಒಳಗೊಂಡಿರಬಹುದು.</string>
    <string name="setup_mobile_data">ಮೊಬೈಲ್ ಡೇಟಾವನ್ನು ಆನ್ ಮಾಡಿ</string>
    <string name="setup_mobile_data_no_service">ಯಾವುದೇ ಸೇವೆ ಇಲ್ಲ</string>
-    <string name="setup_mobile_data_emergency_only">ತುರ್ತುಪರೀಸ್ಥಿತಿ ಕರೆಗಳು ಮಾತ್ರ</string>
-    <string name="enable_mobile_data_summary">ಸೆಟಪ್ ವೇಳೆ ಮೊಬೈಲ್ ಡೇಟಾ ಉಪಯೋಗಿಸಲು ನೀವು ಬಯಸುತ್ತೀರಾ? ಮೊಬೈಲ್ ಡೇಟಾ ಆನ್ ಮಾಡುವುದು ಡೇಟಾ ಶುಲ್ಕಗಳಿಗೆ ಒಳಪಟ್ಟಿರುತ್ತದೆ.</string>
+    <string name="setup_mobile_data_emergency_only">ತುರ್ತುಸ್ಥಿತಿ ಕರೆಗಳು ಮಾತ್ರ</string>
+    <string name="enable_mobile_data_summary">ನೀವು ಸಿದ್ಧತೆಯ ವೇಳೆ ಕೋಶೀಯ ದತ್ತಾಂಶ ಬಳಕೆ ಬಯಸುವಿರಾ? ಕೋಶೀಯ ದತ್ತಾಂಶ ಬಳಕೆ ದತ್ತಾಂಶ ಶುಲ್ಕಗಳಿಗೆ ಒಳಪಡಬಹುದು.</string>
    <string name="no">ಬೇಡ</string>
    <string name="yes">ಹೌದು</string>
-    <string name="emergency_call">ತುರುಪರೀಸ್ಥಿತಿ ಕರೆ</string>
+    <string name="emergency_call">ತುರ್ತುಸ್ಥಿತಿ ಕರೆ</string>
+    <string name="setup_services">LineageOS ವೈಶಿಷ್ಟ್ಯಗಳು</string>
    <string name="services_privacy_policy">ಗೌಪ್ಯತಾ ನೀತಿ</string>
    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> ಸುಧಾರಿಸಲು ನೆರವಾಗು</string>
    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> ವಿಶ್ಲೇಷಣಾತ್ಮಕ ಮತ್ತು ಬಳಕೆಯ ದತ್ತಾಂಶವನ್ನು ಸ್ವಯಂ LineageOSಗೆ ಕಳುಹಿಸುವ ಮೂಲಕ. ಈ ಮಾಹಿತಿಯಿಂದ ನಿಮ್ಮನ್ನು ಗುರುತಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಆದರೆ ಬ್ಯಾಟರಿ, ಅಪ್ಲಿಕೇಶನ್ ಕ್ಷಮತೆ ಮತ್ತು ಹೊಸ <xliff:g id="name" example="LineageOS">%2$s</xliff:g> ವೈಶಿಷ್ಟ್ಯಗಳ ಬಗ್ಗೆ ಕೆಲಸ ಮಾಡುವ ತಂಡಗಳಿಗೆ ನೆರವಾಗುತ್ತದೆ.</string>
-    <string name="services_os_nav_keys_label">ಹಾರ್ಡ್‍ವೇರ್ ಕೀಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ನಾವಿಗೇಶನ್ ಕೀಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
+    <string name="services_os_nav_keys_label">ಯಂತ್ರಾಂಶ ಕೀಲಿಗಳ ಬದಲಾಗಿ <b>ಪರದೆಯ ಮೇಲಿನ ಸಂಚಾಲನೆ ಕೀಲಿಗಳನ್ನು ಉಪಯೋಗಿಸಿ</b>.</string>
    <string name="setup_unlock">ಅನ್‍ಲಾಕ್</string>
    <string name="setup_device_locked">ಸಾಧನವನ್ನು ಬಳಕೆದಾರನು ಲಾಕ್ ಮಾಡಿದ್ದಾರೆ.</string>
-    <string name="setup_device_locked_instructions"><i>ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆಫ್/ಆನ್ ಮಾಡಲು. ದಯವಿಟ್ಟು ಸೆಟ್ಟಿಂಗ್ಸ್ &gt;: ಭದ್ರತೆಗೆ ಹೋಗಿ</i></string>
-    <string name="settings_fingerprint_setup_title">ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="settings_fingerprint_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
-    <string name="fingerprint_setup_title">ಫಿಂಗರ್‍ಪ್ರಿಂಟ್ ಸೆಟಪ್</string>
+    <string name="setup_require_cyanogen_label">ಕಾರ್ಖಾನೆ ಮರುಹೊಂದಿಸಿದ ನಂತರವೂ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಬಳಸಲು <b>ನಿಮ್ಮ ಖಾತೆಯ ಪ್ರವೇಶಪದ ಅಗತ್ಯವಿದೆ </b>.</string>
+    <string name="setup_device_locked_instructions"><i>ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆಫ್/ಆನ್ ಮಾಡಲು ಅಳವಡಿಕೆಗಳು &gt; ಭದ್ರತೆಗೆ ಹೋಗಿ</i></string>
+    <string name="settings_biometric_setup_title">ಬ್ಯಾಕಪ್ ಪರದೆ ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
+    <string name="settings_biometric_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
+    <string name="fingerprint_setup_title">ಬೆರಳಚ್ಚು ರಚನೆ</string>
    <string name="fingerprint_setup_summary">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟ್ ಸಂವೇದಕವನ್ನು ಉಪಯೋಗಿಸಿ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು, ನೀವು ಹೀಗೆ ಮಾಡಬೇಕಾಗುತ್ತದೆ:</string>
-    <string name="fingerprint_setup_backup_lock_method">ಒಂದು ದ್ವಿತೀಯಕ ಅನ್‍ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಸೆಟಪ್ ಮಾಡಿ</string>
-    <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಫಿಂಗರ್‍ಪ್ರಿಂಟನ್ನು ಸೇರಿಸಿ</string>
-    <string name="fingerprint_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
-    <string name="sim_locale_changed">%1$s SIM ಗುರುತಿಸಲ್ಪಟ್ಟಿದೆ</string>
+    <string name="fingerprint_setup_add_fingerprint">ನಿಮ್ಮ ಬೆರಳಚ್ಚನ್ನು ಸೇರಿಸು</string>
+    <string name="biometric_setup_backup_lock_method">ಒಂದು ದ್ವಿತೀಯಕ ಅನ್‍ಲಾಕ್ ಪ್ರಕಾರವನ್ನು ಸೆಟಪ್ ಮಾಡಿ</string>
+    <string name="biometric_setup_screen_lock_setup">ಪರದೆ ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ</string>
+    <string name="sim_locale_changed">%1$s SIM ಪತ್ತೆಯಾಗಿದೆ</string>
    <string name="settings_lockscreen_setup_details">ನಿಮ್ಮ ಪರದೆಯನ್ನು ನೀವು ಹೇಗೆ ಲಾಕ್ ಮಾಡಲು ಬಯಸುವಿರಿ?</string>
    <string name="lockscreen_setup_title" product="default">ನಿಮ್ಮ ಫೋನನ್ನು ರಕ್ಷಿಸಿ</string>
-    <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸಿ</b>. ಸ್ಕ್ರೀನ್‌ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪಿನ್, ಪ್ಯಾಟರ್ನ್, ಪಾಸ್‌ವರ್ಡ್ ಬೇಕಾಗುತ್ತದೆ</string>
+    <string name="lockscreen_setup_summary"><b>ಸಾಧನ ರಕ್ಷಿಸು</b> ಪರದೆ ಬೀಗ ತೆಗೆಯಲು PIN, ನಮೂನೆ, ಪ್ರವೇಶಪದ ಬೇಕಾಗುತ್ತದೆ</string>
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -62,18 +62,25 @@
    <string name="setup_device_locked">이 기기는 사용자에 의해 잠겨 있습니다.</string>
    <string name="setup_require_cyanogen_label">공장 초기화 후에도 기기를 사용하려면 <b>계정 비밀번호가 필요합니다</b>.</string>
    <string name="setup_device_locked_instructions"><i>이 기능을 켜거나 끄려면, 설정 &gt; 보안으로 이동하세요</i></string>
-    <string name="settings_fingerprint_setup_title">백업 화면 잠금 방법 선택</string>
-    <string name="settings_fingerprint_setup_details">화면을 어떻게 잠그시겠습니까?</string>
+    <string name="settings_biometric_setup_title">백업 화면 잠금 방법 선택</string>
+    <string name="settings_biometric_setup_details">화면을 어떻게 잠그시겠습니까?</string>
    <string name="fingerprint_setup_title">지문 설정</string>
-    <string name="fingerprint_setup_summary">지문 인식 센서를 사용하여 화면 잠금을 해제하기 위해서는:</string>
-    <string name="fingerprint_setup_backup_lock_method">보조 잠금 해제 방법을 설정해야 합니다</string>
+    <string name="fingerprint_setup_summary">지문 인식 센서를 사용하여 화면 잠금을 해제하기 위해서는 아래의 설정을 완료해야 합니다.</string>
    <string name="fingerprint_setup_add_fingerprint">지문 추가</string>
-    <string name="fingerprint_setup_screen_lock_setup">화면 잠금 설정</string>
+    <string name="face_setup_title">얼굴 인식 설정</string>
+    <string name="face_setup_summary">얼굴 인식을 사용하여 화면 잠금을 해제하기 위해서는 아래의 설정을 완료해야 합니다.</string>
+    <string name="face_setup_add_face">얼굴 추가</string>
+    <string name="biometric_setup_backup_lock_method">보조 잠금 해제 방법 설정</string>
+    <string name="biometric_setup_screen_lock_setup">화면 잠금 설정</string>
    <string name="sim_locale_changed">%1$s SIM 인식됨</string>
    <string name="settings_lockscreen_setup_title">화면 잠금 방식 선택</string>
    <string name="settings_lockscreen_setup_details">화면을 어떻게 잠그시겠습니까?</string>
    <string name="lockscreen_setup_title" product="tablet">태블릿 보호</string>
    <string name="lockscreen_setup_title" product="default">휴대전화 보호</string>
-    <string name="lockscreen_setup_summary"><b>이 기기를 보호</b>하고 화면 잠금 해제용 PIN, 패턴 또는 비밀번호 요청</string>
+    <string name="lockscreen_setup_summary"><b>이 기기를 보호</b>하고 화면 잠금 해제에 PIN, 패턴 또는 비밀번호가 필요하도록 설정할 수 있습니다.</string>
    <string name="lockscreen_setup_screen_lock_setup">설정</string>
+    <string name="intro_restore_title">앱 및 데이터 복원</string>
+    <string name="intro_restore_subtitle" product="tablet">이전 LineageOS 태블릿에서 했던 백업을 가지고 있다면 여기에서 복원할 수 있습니다.</string>
+    <string name="intro_restore_subtitle" product="default">이전 LineageOS 휴대전화에서 했던 백업을 가지고 있다면 여기에서 복원할 수 있습니다.</string>
+    <string name="intro_restore_button">백업에서 복원</string>
 </resources>
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -51,12 +51,12 @@
    <string name="setup_unlock">Entspären</string>
    <string name="setup_device_locked">Dësen Apparat gouf duerch de Benotzer gespaart.</string>
    <string name="setup_device_locked_instructions"><i>Fir dës Funktioun z\'aktivéieren/desaktivéieren, géi op Astellungen  &gt; Sécherheet</i></string>
-    <string name="settings_fingerprint_setup_title">Wiel den Typ vun der Ersatz-Schirmspär aus</string>
-    <string name="settings_fingerprint_setup_details">Wéi wëlls du däi Schierm spären?</string>
+    <string name="settings_biometric_setup_title">Wiel den Typ vun der Ersatz-Schirmspär aus</string>
+    <string name="settings_biometric_setup_details">Wéi wëlls du däi Schierm spären?</string>
    <string name="fingerprint_setup_title">Fangerofdrock ariichten</string>
    <string name="fingerprint_setup_summary">Wann s du däi Fangerofdrocksensor fir d\'Entspäre vun dengem Schierm benotze wëlls, muss du:</string>
-    <string name="fingerprint_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
    <string name="fingerprint_setup_add_fingerprint">Däi Fangerofdrock dobäisetzen</string>
-    <string name="fingerprint_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
+    <string name="biometric_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
+    <string name="biometric_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
    <string name="settings_lockscreen_setup_details">Wéi wëlls du däi Schierm spären?</string>
 </resources>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -51,12 +51,12 @@
    <string name="setup_unlock">Atrakinti</string>
    <string name="setup_device_locked">Šis įrenginys buvo užrakintas naudotojo.</string>
    <string name="setup_device_locked_instructions"><i>Kad išjungtumėte / įjungtumėte šią funkciją, eikite į Nustatymai &gt; Sauga</i></string>
-    <string name="settings_fingerprint_setup_title">Pasirinkite atsarginį ekrano užrakto tipą</string>
-    <string name="settings_fingerprint_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
+    <string name="settings_biometric_setup_title">Pasirinkite atsarginį ekrano užrakto tipą</string>
+    <string name="settings_biometric_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
    <string name="fingerprint_setup_title">Pirštų atspaudų sąranka</string>
    <string name="fingerprint_setup_summary">Norint naudotis pirštų atspaudų jutikliu, kad atrakinti ekraną, jums reikia:</string>
-    <string name="fingerprint_setup_backup_lock_method">Nustatyti antrinį atrakinimo metodą</string>
    <string name="fingerprint_setup_add_fingerprint">Pridėti savo pirštų atspaudą</string>
-    <string name="fingerprint_setup_screen_lock_setup">Nustatyti ekrano užraktą</string>
+    <string name="biometric_setup_backup_lock_method">Nustatyti antrinį atrakinimo metodą</string>
+    <string name="biometric_setup_screen_lock_setup">Nustatyti ekrano užraktą</string>
    <string name="settings_lockscreen_setup_details">Kaip norėtumėte užrakinti ekraną?</string>
 </resources>
--- a/res/values-lu/strings.xml
+++ b/res/values-lu/strings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Installatiounsassistent</string>
+    <string name="next">Weider</string>
+    <string name="skip">Iwwersprangen</string>
+    <string name="start">Start</string>
+    <string name="ok">OK</string>
+    <string name="loading">Ee Moment w.e.g.\u2026</string>
+    <string name="setup_complete">Installatioun ofgeschloss</string>
+    <string name="setup_welcome">Wëllkomm</string>
+    <string name="setup_wifi">WLAN auswielen</string>
+    <string name="setup_sim_missing">SIM-Kaart feelt</string>
+    <string name="setup_choose_data_sim">SIM fir d\'Daten auswielen</string>
+    <string name="setup_location">Standuertservicer</string>
+    <string name="setup_other">Aner Servicer</string>
+    <string name="setup_datetime">Datum an Zäit</string>
+    <string name="setup_current_date">Aktuellen Datum</string>
+    <string name="setup_current_time">Aktuell Zäit</string>
+    <string name="sim_missing_summary" product="tablet">Et gouf keng SIM-Kaart an dengem Tablet erkannt. Lies d\'Uleedungen déi mam Tablet komm sinn, fir eng SIM-Kaart anzesetzen.</string>
+    <string name="sim_missing_summary" product="default">Et gouf keng SIM-Kaart an dengem Telefon erkannt. Lies d\'Uleedungen déi mam Telefon komm sinn, fir eng SIM-Kaart anzesetzen.</string>
+    <string name="choose_data_sim_summary" product="tablet">Wéi eng SIM soll fir d\'Date benotzt ginn? Déi ausgewiele SIM kéint Netzwierkkäschte verursaachen, well se fir d\'Installatioun vum Tablet benotzt gëtt.</string>
+    <string name="choose_data_sim_summary" product="default">Wéi eng SIM soll fir d\'Date benotzt ginn? Déi ausgewiele SIM kéint Netzwierkkäschte verursaachen, well se fir d\'Installatioun vum Telefon benotzt gëtt.</string>
+    <string name="date_time_summary">Definéier deng Zäitzon an ajustéier falls néideg den aktuellen Datum an déi aktuell Zäit</string>
+    <string name="backup_data_summary">App-Daten, WLAN-Passwierder an aner Astellungen op de Google-Servere <b>sécheren</b></string>
+    <string name="other_services_summary">Dës Servicer gi vu Google zur Verfügung gestallt a kënnen all Moment aktivéiert oder desaktivéiert ginn. D\'Daten ginn an Iwwerastëmmung mat <xliff:g id="name" example="Privacy Policy">%s</xliff:g> vu Google benotzt.</string>
+    <string name="location_services_summary">Standuertservicer erlabe System-Appen an aneren Appen, Informatiounen zum Standuert ze sammelen an ze benotzen. Eng App ka beispillsweis däin ongeféiere Standuert benotzen, fir Caféen an der Géigend ze lokaliséieren.</string>
+    <string name="location_access_summary"><b>Appen déi deng Berechtegung gefrot hunn</b> den Zougrëff op d\'Standuertinformatiounen erlaben. Dat ka fir den aktuelle Standuert an och fir fréier Standuerter gëllen.</string>
+    <string name="setup_mobile_data_no_service">Kee Service</string>
+    <string name="setup_mobile_data_emergency_only">Just Noutriff</string>
+    <string name="no">Nee</string>
+    <string name="yes">Jo</string>
+    <string name="emergency_call">Noutruff</string>
+    <string name="services_privacy_policy">Dateschutzerklärung</string>
+    <string name="services_os_nav_keys_label"><b>Schierm-Navigatiounstasten</b> amplaz Hardwaretaste benotzen.</string>
+    <string name="setup_unlock">Entspären</string>
+    <string name="setup_device_locked">Dësen Apparat gouf duerch de Benotzer gespaart.</string>
+    <string name="setup_device_locked_instructions"><i>Fir dës Funktioun z\'aktivéieren/desaktivéieren, géi op Astellungen  &gt; Sécherheet</i></string>
+    <string name="settings_biometric_setup_title">Wiel den Typ vun der Ersatz-Schirmspär aus</string>
+    <string name="settings_biometric_setup_details">Wéi wëlls du däi Schierm spären?</string>
+    <string name="fingerprint_setup_title">Fangerofdrock ariichten</string>
+    <string name="fingerprint_setup_summary">Wann s du däi Fangerofdrocksensor fir d\'Entspäre vun dengem Schierm benotze wëlls, muss du:</string>
+    <string name="fingerprint_setup_add_fingerprint">Däi Fangerofdrock dobäisetzen</string>
+    <string name="biometric_setup_backup_lock_method">Eng zweet Entspärmethod ariichten</string>
+    <string name="biometric_setup_screen_lock_setup">D\'Schiermspär ariichten</string>
+    <string name="settings_lockscreen_setup_details">Wéi wëlls du däi Schierm spären?</string>
+</resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -51,12 +51,12 @@
    <string name="setup_unlock">Atbloķēt</string>
    <string name="setup_device_locked">Šo ierīci lietotājs ir bloķējis.</string>
    <string name="setup_device_locked_instructions"><i>Lai izslēgtu/ieslēgtu šo iespēju, lūdzu dodieties uz Iestatījumi &gt; Drošība</i></string>
-    <string name="settings_fingerprint_setup_title">Izvēlieties dublējuma ekrānslēga tipu</string>
-    <string name="settings_fingerprint_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
+    <string name="settings_biometric_setup_title">Izvēlieties dublējuma ekrānslēga tipu</string>
+    <string name="settings_biometric_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
    <string name="fingerprint_setup_title">Pirksta nospieduma iestatīšana</string>
    <string name="fingerprint_setup_summary">Lai atbloķētu ekrānu ar pirksta nospiedumu, Jums vajadzēs:</string>
-    <string name="fingerprint_setup_backup_lock_method">Iestatīt sekundāro atbloķēšanas metodi</string>
    <string name="fingerprint_setup_add_fingerprint">Pievienot pirkstu nospiedumu</string>
-    <string name="fingerprint_setup_screen_lock_setup">Iestatīt ekrānslēgu</string>
+    <string name="biometric_setup_backup_lock_method">Iestatīt sekundāro atbloķēšanas metodi</string>
+    <string name="biometric_setup_screen_lock_setup">Iestatīt ekrānslēgu</string>
    <string name="settings_lockscreen_setup_details">Kādu Jūs vēlētos ekrānslēgu?</string>
 </resources>
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">അൺലോക്കുചെയ്യുക</string>
    <string name="setup_device_locked">ഈ ഉപകരണം ഉപയോക്താവ് ലോക്ക് ചെയ്തു.</string>
    <string name="setup_device_locked_instructions"><i>ഈ സവിശേഷത ഓഫ്/ഓൺ ചെയ്യുന്നതിന് ക്രമീകരണങ്ങൾ &gt; സുരക്ഷ എന്നതിലേക്ക് പോകുക</i></string>
-    <string name="settings_fingerprint_setup_title">ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് തരം തിരഞ്ഞെടുക്കുക</string>
-    <string name="settings_fingerprint_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
+    <string name="settings_biometric_setup_title">ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് തരം തിരഞ്ഞെടുക്കുക</string>
+    <string name="settings_biometric_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
    <string name="fingerprint_setup_title">വിരലടയാള സജ്ജീകരണം</string>
    <string name="fingerprint_setup_summary">നിങ്ങളുടെ സ്ക്രീന്‍ അൺലോക്ക് ചെയ്യുന്നതിനായി നിങ്ങളുടെ ഫിംഗര്‍പ്രിന്റ്‌ സെൻസർ ഉപയോഗിക്കുന്നതിന്, നിങ്ങള്‍ക്ക് ആവശ്യമായവ:</string>
-    <string name="fingerprint_setup_backup_lock_method">ഒരു ദ്വിതീയ അൺലോക്ക് മാര്‍ഗ്ഗം സജ്ജമാക്കുക</string>
    <string name="fingerprint_setup_add_fingerprint">നിങ്ങളുടെ വിരലടയാളം ചേർക്കുക</string>
-    <string name="fingerprint_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
+    <string name="biometric_setup_backup_lock_method">ഒരു ദ്വിതീയ അൺലോക്ക് മാര്‍ഗ്ഗം സജ്ജമാക്കുക</string>
+    <string name="biometric_setup_screen_lock_setup">സ്ക്രീൻ ലോക്ക് സജ്ജമാക്കുക</string>
    <string name="sim_locale_changed">%1$s SIM കണ്ടെത്തി</string>
    <string name="settings_lockscreen_setup_details">നിങ്ങളുടെ സ്ക്രീന്‍ എങ്ങനെ ലോക്ക് ചെയ്യാനാണ് നിങ്ങള്‍ ആഗ്രഹിക്കുന്നത്?</string>
    <string name="lockscreen_setup_title" product="default">നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുക</string>
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">अनलॉक करा</string>
    <string name="setup_device_locked">हे डिव्हाइस वापरकर्त्याने लॉक केले आहे.</string>
    <string name="setup_device_locked_instructions"><i>हे वैशिष्ट्य बंद/चालू करण्यासाठी, कृपया सेटिंग्ज &gt; सुरक्षा कडे जा</i></string>
-    <string name="settings_fingerprint_setup_title">बॅकअप स्क्रीन लॉक टाईप निवडा</string>
-    <string name="settings_fingerprint_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
+    <string name="settings_biometric_setup_title">बॅकअप स्क्रीन लॉक टाईप निवडा</string>
+    <string name="settings_biometric_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
    <string name="fingerprint_setup_title">बोटाचा ठसा सेटअप</string>
    <string name="fingerprint_setup_summary">तुमचा स्क्रीन अनलॉक करण्यासाठी, तुमचा बोटाचा ठसा सेन्सर वापरण्यासाठी तुम्हाला हे करावे लागेल:</string>
-    <string name="fingerprint_setup_backup_lock_method">दुय्यम अनलॉक पध्दत सेटअप करा</string>
    <string name="fingerprint_setup_add_fingerprint">तुमचा बोटाचा ठसा जोडा</string>
-    <string name="fingerprint_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
+    <string name="biometric_setup_backup_lock_method">दुय्यम अनलॉक पध्दत सेटअप करा</string>
+    <string name="biometric_setup_screen_lock_setup">स्क्रीन लॉक सेटअप करा</string>
    <string name="sim_locale_changed">%1$s सिम आढळले</string>
    <string name="settings_lockscreen_setup_details">तुम्हाला तुमचा स्क्रीन कसा लॉक करायला आवडेल?</string>
    <string name="lockscreen_setup_title" product="default">आपला फोन संरक्षित करा</string>
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">စတင်သတ်မှတ်ခြင်း</string>
+    <string name="next">နောက်သို့</string>
+    <string name="skip">ကျော်မည်</string>
+    <string name="start">စတင်မည်</string>
+    <string name="done">ပြီးဆုံးပါပြီ</string>
+    <string name="ok">ကောင်းပြီ</string>
+    <string name="loading">ခဏစောင့်ပါ\u2026</string>
+    <string name="setup_complete">စတင်သတ်မှတ်ခြင်းပြီးဆုံးပါပြီ</string>
+    <string name="setup_welcome">ကြိုဆိုပါ၏</string>
+    <string name="setup_locale">ဘာသာစကား</string>
+    <string name="setup_wifi">ဝိုင်ဖိုင် ရွေးပါ</string>
+    <string name="setup_sim_missing">ဆင်းမ်ကဒ် မရှိပါ</string>
+    <string name="setup_choose_data_sim">အင်တာနက်သုံးရန် ဆင်းမ်ကဒ် ရွေးပါ</string>
+    <string name="setup_location">တည်နေရာပြလုပ်ဆောင်ချက်များ</string>
+    <string name="setup_other">အခြားလုပ်ဆောင်ချက်များ</string>
+    <string name="setup_datetime">ရက်စွဲနှင့် အချိန်</string>
+    <string name="setup_current_date">လက်ရှိနေ့စွဲ</string>
+    <string name="setup_current_time">လက်ရှိအချိန်</string>
+    <string name="sim_missing_summary" product="tablet">သင့် တက်ဘလက်တွင် ဆင်းကဒ်ကိုမတွေ့ရှိပါ။ ဆင်းကဒ်ထည့်ရန် ပစ္စည်းဝယ်စဉ်က ပါလာသော လမ်းညွှန်ချက်ကိုဖတ်ပါ။</string>
+    <string name="sim_missing_summary" product="default">သင့်ဖုန်းတွင် ဆင်းကဒ်ကိုမတွေ့ရှိပါ။ ဆင်းကဒ်ထည့်ရန် ပစ္စည်းဝယ်စဉ်က ပါလာသော လမ်းညွှန်ချက်ကိုဖတ်ပါ။</string>
+    <string name="choose_data_sim_summary" product="tablet">အင်တာနက်အသုံးပြုရန် မည်သည့်ဆင်း(မ်)ကဒ်ကိုရွေးမည်နည်း။ ရွေးချယ်လိုက်သော ဆင်း(မ်)ကဒ်ကို သင်၏တက်ဘလက် စတင်ချိန်အသုံးပြုမည်ဖြစ်သောကြောင့် အင်တာနက်အသုံးပြုခ ကုန်ကျနိုင်ပါသည်။</string>
+    <string name="choose_data_sim_summary" product="default">အင်တာနက်အသုံးပြုရန် မည်သည့်ဆင်း(မ်)ကဒ်ကိုရွေးမည်နည်း။ ရွေးချယ်လိုက်သော ဆင်း(မ်)ကဒ်ကို သင်၏ဖုန်း စတင်ချိန်အသုံးပြုမည်ဖြစ်သောကြောင့် အင်တာနက်အသုံးပြုခ ကုန်ကျနိုင်ပါသည်။</string>
+    <string name="date_time_summary">သင်၏အချိန်ဇုန်ကိုရွေးချယ်ပြီး လိုအပ်ပါက လက်ရှိရက်စွဲနှင့်အချိန်ကို ချိန်ညှိပါ။</string>
+    <string name="backup_data_summary">အက်ပ်စ်ဒေတာ၊ ဝိုင်ဖိုင်လျို့ဝှက်စကားလုံး၊ နှင့် ဂူးဂဲလ်ဆာဗာများအတွက် အခြားဆက်တင်များကို <b>အပိုသိမ်းဆည်းထားမည်</b></string>
+    <string name="other_services_summary">ဤလုပ်ဆောင်ချက်များသည် သင်အသုံးပြုနိုင်ရန် ဂူဂယ်မှထည့်သွင်းပေးထားခြင်းဖြစ်ပြီး ၎င်းတို့ကိုအချိန်မရွေး ဖွင့်နိုင်၊ပိတ်နိုင်သည်။ အချက်အလက်များကို ဂူဂယ်၏ <xliff:g id="name" example="Privacy Policy">%s</xliff:g> တွင်ဖော်ပြချက်အတိုင်းအသုံးပြုမည်ဖြစ်သည်။</string>
+    <string name="location_services_summary">စနစ်နှင့်အခြားနေရာမှထည့်သွင်းထားသော အက်ပ်များကို တည်နေရာပြအသုံးပြုမှုပေးထားခြင်းသည် သင်၏တည်နေရာပြခန့်မှန်းချက်ကို ရယူအသုံးပြုမည်ဖြစ်သည်။ ဥပမာ အက်ပ်တစ်ခုခုသည် အနီးရှိကော်ဖီဆိုင်များကိုပြပေးနိုင်ရန် တည်နေရာပြခန့်မှန်းချက်ကိုအသုံးပြုမည်ဖြစ်သည်။</string>
+    <string name="location_access_summary">သင်၏တည်နေရာဆိုင်ရာအချက်အလက်များကိုအသုံးပြုရန် <b>ခွင့်တောင်းထားသော အက်ပ်များကိုခွင့်ပြုမည်။</b> ၎င်းတွင် သင်၏လက်ရှိတည်နေရာနှင့် ယခင်ကတည်နေရာဆိုင်ရာအချက်အလက်များပါဝင်သည်။</string>
+    <string name="setup_mobile_data">ဆဲလ်လူလာ ဒေတာကို ဖွင့်မည်။</string>
+    <string name="setup_mobile_data_no_service">ဝန်ဆောင်မှု မရှိပါ</string>
+    <string name="setup_mobile_data_emergency_only">အရေးပေါ်ခေါ်ဆိုမှုများသာ</string>
+    <string name="enable_mobile_data_summary">စတင်သတ်မှတ်ချိန်တွင် ဆယ်လူလာဒေတာကို အသုံးပြုလိုပါသလား။ ဆယ်လူလာဒေတာဖွင့်ခြင်းသည် အင်တာနက်အသုံးပြုခကောက်ခံမှုများ ရှိနိုင်ပါသည်။</string>
+    <string name="no">မလုပ်ပါ</string>
+    <string name="yes">လုပ်မည်</string>
+    <string name="data_sim_name">ဆင်း(မ်) <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">အရေးပေါ် ခေါ်ဆိုမှု</string>
+    <string name="setup_services">LineageOS လုပ်ဆောင်နိုင်မှုများ</string>
+    <string name="services_explanation" product="tablet">ဤလုပ်ဆောင်ချက်သည် သင့်တက်ဘလက်၏ စွမ်းဆောင်နိုင်မှုကို တိုးမြင့်စေနိုင်ပါသည်။ အချက်အလက်များကို LineageOS၏ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>အတိုင်း အသုံးပြုပါမည်။</string>
+    <string name="services_explanation" product="default">ဤလုပ်ဆောင်ချက်သည် သင့်ဖုန်း၏ စွမ်းဆောင်နိုင်မှုကို တိုးမြင့်စေနိုင်ပါသည်။ အချက်အလက်များကို LineageOS၏ <xliff:g id="name" example="Privacy Policy">%s</xliff:g>အတိုင်း အသုံးပြုပါမည်။</string>
+    <string name="services_privacy_policy">ပုဂ္ဂိုလ်ရေးလုံခြုံမှု မူဝါဒ</string>
+    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> ကိုတိုးတက်လာအောင် ကူညီပါ။</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> သည် ပြဿနာများနှင့် အသုံးပြုမှုဆိုင်ရာအချက်အလက်များကို LineageOS သို့ပေးပို့ပါမည်။ အချက်အလက်များသည် သင်မည်သူမည်ဝါဖြစ်သည်ကို မခွဲခြားနိုင်ဘဲ ဘက်ထရီသက်တမ်း, အက်ပ်များ၏ စွမ်းဆောင်ရည်များနှင့် <xliff:g id="name" example="LineageOS">%2$s</xliff:g>၏ လုပ်ဆောင်မှုအသစ်များကဲ့သို့သော အချက်အလက်များကို အလုပ်လုပ်နေသောအဖွဲ့ထံသို့သာ လွှဲပြောင်းပါမည်။</string>
+</resources>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -59,13 +59,13 @@
    <string name="setup_device_locked">Denne enheten er låst av brukeren.</string>
    <string name="setup_require_cyanogen_label"><b>Krev passord til konto</b> for å bruke enheten etter en fabrikkgjennoppretting.</string>
    <string name="setup_device_locked_instructions"><i>For å slå denne funksjonen av/på, kan du gå til Innstillinger &gt; sikkerhet</i></string>
-    <string name="settings_fingerprint_setup_title">Velg alternativ skjermlåstype</string>
-    <string name="settings_fingerprint_setup_details">Hvordan vil du låse skjermen din?</string>
+    <string name="settings_biometric_setup_title">Velg alternativ skjermlåstype</string>
+    <string name="settings_biometric_setup_details">Hvordan vil du låse skjermen din?</string>
    <string name="fingerprint_setup_title">Fingeravtrykksoppsett</string>
    <string name="fingerprint_setup_summary">Hvis du vil bruke fingeravtrykkssensoren for å låse opp skjermen din, må du:</string>
-    <string name="fingerprint_setup_backup_lock_method">Konfigurere en sekundær opplåsingsmetode</string>
    <string name="fingerprint_setup_add_fingerprint">Legge til fingeravtrykket ditt</string>
-    <string name="fingerprint_setup_screen_lock_setup">Konfigurere skjermlås</string>
+    <string name="biometric_setup_backup_lock_method">Konfigurere en sekundær opplåsingsmetode</string>
+    <string name="biometric_setup_screen_lock_setup">Konfigurere skjermlås</string>
    <string name="sim_locale_changed">%1$s SIM oppdaget</string>
    <string name="settings_lockscreen_setup_title">Velg skjermlåstype</string>
    <string name="settings_lockscreen_setup_details">Hvordan vil du låse skjermen din?</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -46,27 +46,32 @@
    <string name="setup_mobile_data">Mobiele gegevens inschakelen</string>
    <string name="setup_mobile_data_no_service">Geen verbinding</string>
    <string name="setup_mobile_data_emergency_only">Alleen noodoproepen</string>
-    <string name="enable_mobile_data_summary">Wilt u mobiele gegevens gebruiken tijdens het instellen? Hiermee kunnen kosten gemoeid zijn.</string>
+    <string name="enable_mobile_data_summary">Wilt u mobiele gegevens gebruiken tijdens het instellen? Hier kunnen kosten aan verbonden zijn.</string>
    <string name="no">Nee</string>
    <string name="yes">Ja</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Noodoproep</string>
    <string name="setup_services">Functies van LineageOS</string>
    <string name="services_explanation" product="tablet">Deze diensten worden gebruikt om de mogelijkheden van uw tablet uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van LineageOS.</string>
    <string name="services_explanation" product="default">Deze diensten worden gebruikt om de mogelijkheden van uw telefoon uit te breiden. Gegevens worden gebruikt conform de \'<xliff:g id="name" example="Privacy Policy">%s</xliff:g>\' van LineageOS.</string>
    <string name="services_privacy_policy">Privacybeleid</string>
    <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> door automatisch diagnose- en verbruiksgegevens te verzenden naar LineageOS. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-functies.</string>
    <string name="services_os_nav_keys_label"><b>On-screen navigatieknoppen</b> gebruiken in plaats van de hardwareknoppen.</string>
    <string name="setup_unlock">Ontgrendelen</string>
    <string name="setup_device_locked">Dit apparaat is vergrendeld door de gebruiker.</string>
    <string name="setup_require_cyanogen_label"><b>Uw accountwachtwoord vereisen</b> om het apparaat te gebruiken, zelfs na terugzetten naar fabrieksinstellingen.</string>
    <string name="setup_device_locked_instructions"><i>Om deze functie in of uit te schakelen, ga naar Instellingen &gt; Beveiliging</i></string>
-    <string name="settings_fingerprint_setup_title">Back-up selecteren voor schermvergrendeling</string>
-    <string name="settings_fingerprint_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
+    <string name="settings_biometric_setup_title">Back-up selecteren voor schermvergrendeling</string>
+    <string name="settings_biometric_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
    <string name="fingerprint_setup_title">Vingerafdruk instellen</string>
    <string name="fingerprint_setup_summary">Om de vingerafdruksensor te gebruiken om uw scherm te ontgrendelen dient u:</string>
-    <string name="fingerprint_setup_backup_lock_method">Een tweede ontgrendelmethode in te stellen</string>
    <string name="fingerprint_setup_add_fingerprint">Uw vingerafdruk toe te voegen</string>
-    <string name="fingerprint_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
+    <string name="face_setup_title">Gezicht instellen</string>
+    <string name="face_setup_summary">Om met je gezicht te ontgrendelen moet je het volgende doen:</string>
+    <string name="face_setup_add_face">Voeg je gezicht toe</string>
+    <string name="biometric_setup_backup_lock_method">Een tweede ontgrendelmethode in te stellen</string>
+    <string name="biometric_setup_screen_lock_setup">Schermvergrendeling in te stellen</string>
    <string name="sim_locale_changed">%1$s simkaart gedetecteerd</string>
    <string name="settings_lockscreen_setup_title">Schermvergrendelingstype selecteren</string>
    <string name="settings_lockscreen_setup_details">Hoe wilt u uw scherm vergrendelen?</string>
@@ -74,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Bescherm uw telefoon</string>
    <string name="lockscreen_setup_summary"><b>Bescherm dit apparaat</b> en vraag om een pincode, patroon of wachtwoord om het scherm te ontgrendelen</string>
    <string name="lockscreen_setup_screen_lock_setup">Instellen</string>
+    <string name="intro_restore_title">Herstel apps en gegevens</string>
+    <string name="intro_restore_subtitle" product="tablet">Als u een back-up heeft van uw laatste LineageOS tablet, kunt u deze hier herstellen.</string>
+    <string name="intro_restore_subtitle" product="default">Als u een back-up heeft van uw laatste LineageOS tablet, kunt u deze hier herstellen.</string>
+    <string name="intro_restore_button">Backup terugzetten</string>
 </resources>
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">ଅନଲକ୍</string>
    <string name="setup_device_locked">ଏହି ଡିଭାଇସ୍‍ ଉପଭୋକ୍ତାଙ୍କ ଦ୍ୱାରା ଲକ୍‍ ହୋଇଛି।</string>
    <string name="setup_device_locked_instructions"><i>ଏହି ବୈଶିଷ୍ଟ୍ୟ ଅଫ୍‍/ଅନ୍‍ କରିବା ପାଇଁ, ଦୟାକରି ସେଟିଂସ୍‍&gt;ସୁର‍କ୍ଷାକୁ ଯାଆନ୍ତୁ</i></string>
-    <string name="settings_fingerprint_setup_title">ବ୍ୟାକ୍‍ଅପ୍‍ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ପ୍ରକାର ଚୟନ କରନ୍ତୁ</string>
-    <string name="settings_fingerprint_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
+    <string name="settings_biometric_setup_title">ବ୍ୟାକ୍‍ଅପ୍‍ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ପ୍ରକାର ଚୟନ କରନ୍ତୁ</string>
+    <string name="settings_biometric_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
    <string name="fingerprint_setup_title">ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ସେଟ୍‍ଅପ୍‍</string>
    <string name="fingerprint_setup_summary">ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଅନ୍‍ଲକ୍‍ କରିବା ପାଇଁ ଆପଣଙ୍କ ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ସେନ୍‍ସର୍‍ ବ୍ୟବହାର କରିବା ପାଇଁ, ଆପଣଙ୍କୁ ଏହା କରିବାକ୍ଲୁ ହେବ:</string>
-    <string name="fingerprint_setup_backup_lock_method">ଏକ ସେକେଣ୍ଡାରି ଅନ୍‍ଲକ୍‍ ପଧତି ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
    <string name="fingerprint_setup_add_fingerprint">ଆପଣଙ୍କ ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ଯୋଗ କରନ୍ତୁ</string>
-    <string name="fingerprint_setup_screen_lock_setup">ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
+    <string name="biometric_setup_backup_lock_method">ଏକ ସେକେଣ୍ଡାରି ଅନ୍‍ଲକ୍‍ ପଧତି ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
+    <string name="biometric_setup_screen_lock_setup">ସ୍କ୍ରିନ୍‍ ଲକ୍‍ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
    <string name="sim_locale_changed">%1$s SIM ସନ୍ଧାନ କରାଯାଇଛି</string>
    <string name="settings_lockscreen_setup_details">ଆପଣ କିପରି ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଲକ୍‍ କରିବାକୁ ଚାହିଁବେ?</string>
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,16 +31,16 @@
    <string name="setup_choose_data_sim">Wybierz kartę SIM dla danych mobilnych</string>
    <string name="setup_location">Usługi lokalizacyjne</string>
    <string name="setup_other">Inne usługi</string>
-    <string name="setup_datetime">Data &amp; czas</string>
+    <string name="setup_datetime">Data i czas</string>
    <string name="setup_current_date">Aktualna data</string>
    <string name="setup_current_time">Aktualny czas</string>
    <string name="sim_missing_summary" product="tablet">Karta SIM nie została wykryta w tablecie. Aby włożyć kartę SIM, przeczytaj instrukcję dołączoną do tabletu.</string>
    <string name="sim_missing_summary" product="default">Karta SIM nie została wykryta w twoim telefonie. Aby włożyć kartę SIM, przeczytaj instrukcję dołączoną do telefonu.</string>
    <string name="choose_data_sim_summary" product="tablet">Której karty SIM chcesz użyć do transmisji danych? Wybrana karta SIM może spowodować dodatkowe koszty, ponieważ zostanie ona użyta do skonfigurowania tabletu.</string>
    <string name="choose_data_sim_summary" product="default">Której karty SIM chcesz użyć do transmisji danych? Wybrana karta SIM może spowodować dodatkowe koszty, ponieważ zostanie ona użyta do skonfigurowania telefonu.</string>
-    <string name="date_time_summary">Ustaw strefę czasową, bieżącą datę i czas jeśli jest potrzebna</string>
+    <string name="date_time_summary">Ustaw swoją strefę czasową i dostosuj bieżącą datę i godzinę w razie potrzeby</string>
    <string name="backup_data_summary">Wykonaj <b>kopię zapasową</b> danych aplikacji, haseł WiFi i innych ustawień na serwerach Google</string>
-    <string name="other_services_summary">Usługi te umożliwiają działanie aplikacjom Google, możesz jest włączyć lub wyłączyć kiedy chcesz. Dane będą wykorzystywane zgodnie z Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
+    <string name="other_services_summary">Usługi te umożliwiają działanie aplikacjom Google, możesz je włączyć lub wyłączyć, kiedy zechcesz. Dane będą wykorzystywane zgodnie z <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
    <string name="location_services_summary">Usługi lokalizacji umożliwiają systemowi i innym aplikacjom na zbieranie danych o użytkowniku w celu szybszego ustalenia przybliżonej lokalizacji. Np. jakaś aplikacja może użyć twojej przybliżonej lokalizacji w celu zlokalizowania kawiarni, które znajdują się w pobliżu.</string>
    <string name="location_access_summary"><b>Zezwalaj aplikacjom, które zapytały cię o zezwolenie</b> do używania informacji o twojej lokalizacji. Może to obejmować twoje poprzednie, ale i bieżącą lokalizację.</string>
    <string name="setup_mobile_data">Włącz transmisję danych</string>
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">Czy chcesz użyć mobilnej transmisji danych podczas instalacji? Włączenie transmisji danych może wiązać się z dodatkowymi opłatami.</string>
    <string name="no">Nie</string>
    <string name="yes">Tak</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Połączenie alarmowe</string>
    <string name="setup_services">Funkcje LineageOS</string>
    <string name="services_explanation" product="tablet">Te usługi są uruchomione w celu rozszerzenia możliwości twojego tabletu. Dane będą używane zgodnie z <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
@@ -61,13 +62,16 @@
    <string name="setup_device_locked">To urządzenie zostało zablokowane przez użytkownika.</string>
    <string name="setup_require_cyanogen_label"><b>Wymagaj hasła do konta</b>, aby korzystać z urządzenia nawet po przywróceniu ustawień fabrycznych.</string>
    <string name="setup_device_locked_instructions"><i>Aby włączyć/wyłączyć tę funkcję, przejdź do Ustawienia &gt; Zabezpieczenia</i></string>
-    <string name="settings_fingerprint_setup_title">Wybierz zapasową opcję blokady ekranu</string>
-    <string name="settings_fingerprint_setup_details">Jak chcesz blokować swój ekran?</string>
+    <string name="settings_biometric_setup_title">Wybierz zapasową opcję blokady ekranu</string>
+    <string name="settings_biometric_setup_details">Jak chcesz blokować swój ekran?</string>
    <string name="fingerprint_setup_title">Konfiguracja odcisków palców</string>
    <string name="fingerprint_setup_summary">Aby użyć czujnika linii papilarnych do odblokowania ekranu, musisz:</string>
-    <string name="fingerprint_setup_backup_lock_method">Skonfigurować drugą metodę odblokowania</string>
    <string name="fingerprint_setup_add_fingerprint">Dodać swój odcisk palca</string>
-    <string name="fingerprint_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
+    <string name="face_setup_title">Konfiguracja odblokowywania twarzą</string>
+    <string name="face_setup_summary">Aby używać twarzy do odblokowania ekranu, musisz:</string>
+    <string name="face_setup_add_face">Dodaj swoją twarz</string>
+    <string name="biometric_setup_backup_lock_method">Skonfigurować drugą metodę odblokowania</string>
+    <string name="biometric_setup_screen_lock_setup">Skonfigurować blokadę ekranu</string>
    <string name="sim_locale_changed">Wykryto %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Wybierz typ blokady ekranu</string>
    <string name="settings_lockscreen_setup_details">Jak chcesz blokować swój ekran?</string>
@@ -75,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Zabezpiecz telefon</string>
    <string name="lockscreen_setup_summary"><b>Zabezpiecz to urządzenie</b>, wymagając kodu PIN, wzoru lub hasła do odblokowania ekranu</string>
    <string name="lockscreen_setup_screen_lock_setup">Konfiguracja</string>
+    <string name="intro_restore_title">Przywróć aplikacje i dane</string>
+    <string name="intro_restore_subtitle" product="tablet">Jeśli masz kopię zapasową ze swojego poprzedniego tabletu z systemem LineageOS, możesz ją tutaj przywrócić.</string>
+    <string name="intro_restore_subtitle" product="default">Jeśli masz kopię zapasową ze swojego poprzedniego telefonu z systemem LineageOS, możesz ją tutaj przywrócić.</string>
+    <string name="intro_restore_button">Przywróć z kopii zapasowej</string>
 </resources>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -62,13 +62,14 @@
    <string name="setup_device_locked">Este dispositivo foi bloqueado pelo usuário.</string>
    <string name="setup_require_cyanogen_label"><b>Exigir a senha de sua conta</b> para usar o dispositivo mesmo depois de restaurar os padrões de fábrica.</string>
    <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá para Configurações e Segurança</i></string>
-    <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio de tela do backup</string>
-    <string name="settings_fingerprint_setup_details">Como você gostaria de bloquear a tela?</string>
+    <string name="settings_biometric_setup_title">Selecione o tipo de bloqueio de tela do backup</string>
+    <string name="settings_biometric_setup_details">Como você gostaria de bloquear a tela?</string>
    <string name="fingerprint_setup_title">Configuração de impressão digital</string>
    <string name="fingerprint_setup_summary">Para usar o sensor de impressão digital para desbloquear a tela, você vai precisar de:</string>
-    <string name="fingerprint_setup_backup_lock_method">Configurar um método de desbloqueio secundário</string>
    <string name="fingerprint_setup_add_fingerprint">Adicionar sua impressão digital</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
+    <string name="face_setup_add_face">Adicionar o seu rosto</string>
+    <string name="biometric_setup_backup_lock_method">Configurar um método de desbloqueio secundário</string>
+    <string name="biometric_setup_screen_lock_setup">Configuração de bloqueio de tela</string>
    <string name="sim_locale_changed">Cartão SIM %1$s detectado</string>
    <string name="settings_lockscreen_setup_title">Selecione o tipo de bloqueio de tela</string>
    <string name="settings_lockscreen_setup_details">Como você gostaria de bloquear a tela?</string>
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Este dispositivo foi bloqueado pelo utilizador.</string>
    <string name="setup_require_cyanogen_label"><b>Exigir a palavra-passe da sua conta</b> para usar o dispositivo mesmo depois da reposição dos dados de fábrica.</string>
    <string name="setup_device_locked_instructions"><i>Para ativar ou desativar este recurso, por favor vá a Definições de Segurança</i></string>
-    <string name="settings_fingerprint_setup_title">Selecione o tipo de bloqueio do ecrã da cópia de segurança</string>
-    <string name="settings_fingerprint_setup_details">Como gostaria de bloquear o seu ecrã?</string>
+    <string name="settings_biometric_setup_title">Selecione o tipo de bloqueio do ecrã da cópia de segurança</string>
+    <string name="settings_biometric_setup_details">Como gostaria de bloquear o seu ecrã?</string>
    <string name="fingerprint_setup_title">Configuração de impressão digital</string>
    <string name="fingerprint_setup_summary">Para usar o seu sensor de impressão digital para desbloquear o ecrã, precisará de:</string>
-    <string name="fingerprint_setup_backup_lock_method">Definir um método de desbloqueio secundário</string>
    <string name="fingerprint_setup_add_fingerprint">Adicionar a sua impressão digital</string>
-    <string name="fingerprint_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
+    <string name="face_setup_title">Configurar reconhecimento facial</string>
+    <string name="face_setup_summary">Para desbloquear o ecrã com o rosto, será necessário:</string>
+    <string name="face_setup_add_face">Adicionar o seu rosto</string>
+    <string name="biometric_setup_backup_lock_method">Definir um método de desbloqueio secundário</string>
+    <string name="biometric_setup_screen_lock_setup">Configuração do ecrã de bloqueio</string>
    <string name="sim_locale_changed">Cartão SIM %1$s detetado</string>
    <string name="settings_lockscreen_setup_title">Selecionar o tipo de bloqueio do ecrã</string>
    <string name="settings_lockscreen_setup_details">Como gostaria de bloquear o seu ecrã?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Proteja o seu telefone</string>
    <string name="lockscreen_setup_summary"><b>Protejer este dispositivo</b> ao exigir um código PIN, padrão ou palavra-passe para desbloqueio do ecrã</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
+    <string name="intro_restore_title">Restaurar aplicações e dados</string>
+    <string name="intro_restore_subtitle" product="tablet">Se tiver uma cópia de segurança do seu anterior tablet com LineageOS, pode restaurá-la aqui.</string>
+    <string name="intro_restore_subtitle" product="default">Se tiver uma cópia de segurança do seu anterior telefone com LineageOS, pode restaurá-la aqui.</string>
+    <string name="intro_restore_button">Restaurar a partir de cópia de segurança</string>
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Acest dispozitiv a fost blocat de utilizator.</string>
    <string name="setup_require_cyanogen_label"><b>Este necesară parola contului dvs.</b> pentru a vă utiliza dispozitivul după fiecare resetare la datele din fabrică.</string>
    <string name="setup_device_locked_instructions"><i>Pentru a activa sau dezactiva această caracteristică, vă rugăm să mergeți la Setări &gt; securitate</i></string>
-    <string name="settings_fingerprint_setup_title">Selectați tipul de blocare ecran de rezervă</string>
-    <string name="settings_fingerprint_setup_details">Cum doriți să vă blocați ecranul?</string>
+    <string name="settings_biometric_setup_title">Selectați tipul de blocare ecran de rezervă</string>
+    <string name="settings_biometric_setup_details">Cum doriți să vă blocați ecranul?</string>
    <string name="fingerprint_setup_title">Configurare amprentă</string>
    <string name="fingerprint_setup_summary">Pentru a putea utiliza senzorul amprentei pentru a debloca ecranul, trebuie să:</string>
-    <string name="fingerprint_setup_backup_lock_method">Configurați o metodă secundară de deblocare</string>
    <string name="fingerprint_setup_add_fingerprint">Adăugați-vă amprenta</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setați blocarea de ecran</string>
+    <string name="face_setup_title">Configurare față</string>
+    <string name="face_setup_summary">Pentru a vă folosi fața pentru a debloca ecranul trebuie să:</string>
+    <string name="face_setup_add_face">Adăugați-vă fața</string>
+    <string name="biometric_setup_backup_lock_method">Configurați o metodă secundară de deblocare</string>
+    <string name="biometric_setup_screen_lock_setup">Setați blocarea de ecran</string>
    <string name="sim_locale_changed">SIM %1$s detectat</string>
    <string name="settings_lockscreen_setup_title">Selectați tipul de blocare ecran</string>
    <string name="settings_lockscreen_setup_details">Cum doriți să vă blocați ecranul?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Protejați telefonul</string>
    <string name="lockscreen_setup_summary"><b>Protejați dispozitivul</b> cu PIN, model sau parolă necesară pt. a debloca ecranul</string>
    <string name="lockscreen_setup_screen_lock_setup">Configurați</string>
+    <string name="intro_restore_title">Restabiliți aplicațiile și datele</string>
+    <string name="intro_restore_subtitle" product="tablet">Dacă aveţi o copie de rezervă de pe ultima dvs. tabletă LineageOS, o puteţi restaura aici.</string>
+    <string name="intro_restore_subtitle" product="default">Dacă aveţi o copie de rezervă de pe ultimul dvs. telefon LineageOS, o puteţi restaura aici.</string>
+    <string name="intro_restore_button">Restaurează din backup</string>
 </resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -38,10 +38,10 @@
    <string name="sim_missing_summary" product="default">В телефоне не обнаружена SIM-карта. Чтобы узнать, как ее вставить, ознакомьтесь с инструкцией к вашему устройству.</string>
    <string name="choose_data_sim_summary" product="tablet">Какую SIM-карту использовать для передачи данных? Выбранная SIM-карта может повлечь расходы за сетевое подключение, так как она будет использоваться для настройки планшета.</string>
    <string name="choose_data_sim_summary" product="default">Какую SIM-карту использовать для передачи данных? Выбранная SIM-карта может повлечь расходы за сетевое подключение, так как она будет использоваться для настройки телефона.</string>
-    <string name="date_time_summary">Установите свой часовой пояс и настройте текущую дату и время, если необходимо</string>
+    <string name="date_time_summary">Установите свой часовой пояс и при необходимости скорректируйте текущую дату и время</string>
    <string name="backup_data_summary"><b>Сохранять</b> данные приложений, пароли Wi-Fi и другие параметры на серверах Google</string>
    <string name="other_services_summary">Эти службы обеспечивают работу Google, и вы можете включить или выключить их в любое время. Данные будут использоваться в соответствии с <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
-    <string name="location_services_summary">Службы местоположения позволяют системе и установленным приложениям собирать и использовать такие данные, как ваше приблизительное местоположение. Например, приложение может искать кофейни поблизости, основываясь на данных о вашем местоположении.</string>
+    <string name="location_services_summary">Службы определения местоположения позволяют системным и сторонним приложениям собирать и использовать данные о вашем приблизительном местоположении. Например, приложение может использовать ваше местоположение для поиска ближайших кофеен.</string>
    <string name="location_access_summary"><b>Разрешить приложениям, запросившим ваше разрешение</b>, использовать информацию о вашем местоположении. Это может включать ваше текущее и прошлые местоположения.</string>
    <string name="setup_mobile_data">Включить передачу данных</string>
    <string name="setup_mobile_data_no_service">Нет сети</string>
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Устройство заблокировано пользователем.</string>
    <string name="setup_require_cyanogen_label"><b>Требовать пароль входа в аккаунт</b> для использования устройства даже после сброса настроек.</string>
    <string name="setup_device_locked_instructions"><i>Чтобы включить или отключить эту функцию, перейдите в меню \'Настройки &gt; Безопасность\'</i></string>
-    <string name="settings_fingerprint_setup_title">Выберите запасной режим блокировки экрана</string>
-    <string name="settings_fingerprint_setup_details">Как следует блокировать экран?</string>
+    <string name="settings_biometric_setup_title">Выберите запасной режим блокировки экрана</string>
+    <string name="settings_biometric_setup_details">Как следует блокировать экран?</string>
    <string name="fingerprint_setup_title">Настройка отпечатков пальцев</string>
    <string name="fingerprint_setup_summary">Чтобы использовать сканер отпечатков пальцев для разблокировки экрана, необходимо:</string>
-    <string name="fingerprint_setup_backup_lock_method">Настроить дополнительный способ разблокировки</string>
    <string name="fingerprint_setup_add_fingerprint">Добавить ваши отпечатки</string>
-    <string name="fingerprint_setup_screen_lock_setup">Настроить экран блокировки</string>
+    <string name="face_setup_title">Разблокировка по лицу</string>
+    <string name="face_setup_summary">Чтобы использовать ваше лицо для разблокировки экрана, необходимо:</string>
+    <string name="face_setup_add_face">Добавить ваше лицо</string>
+    <string name="biometric_setup_backup_lock_method">Настроить дополнительный способ разблокировки</string>
+    <string name="biometric_setup_screen_lock_setup">Настроить экран блокировки</string>
    <string name="sim_locale_changed">Обнаружена %1$s SIM-карта</string>
    <string name="settings_lockscreen_setup_title">Выбрать способ блокировки экрана</string>
    <string name="settings_lockscreen_setup_details">Как вы хотите заблокировать ваш экран?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Защитите свой телефон</string>
    <string name="lockscreen_setup_summary"><b>Защитить это устройство</b> и запрашивать PIN-код, графический ключ или пароль для разблокировки экрана</string>
    <string name="lockscreen_setup_screen_lock_setup">Настройка</string>
+    <string name="intro_restore_title">Восстановить приложения и данные</string>
+    <string name="intro_restore_subtitle" product="tablet">Если у вас есть резервная копия, сделанная на другом планшете с LineageOS, вы можете восстановить ее здесь.</string>
+    <string name="intro_restore_subtitle" product="default">Если у вас есть резервная копия, сделанная на другом телефоне с LineageOS, вы можете восстановить ее здесь.</string>
+    <string name="intro_restore_button">Восстановить из резервной копии</string>
 </resources>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -24,7 +24,7 @@
    <string name="ok">OK</string>
    <string name="loading">Moment\u2026</string>
    <string name="setup_complete">Nastavenie je dokončené</string>
-    <string name="setup_welcome">Vitajte v CyanogenMode</string>
+    <string name="setup_welcome">Vitajte</string>
    <string name="setup_locale">Jazyk</string>
    <string name="setup_wifi">Vyberte Wi-Fi</string>
    <string name="setup_sim_missing">Vložte kartu SIM</string>
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">Chcete používať mobilné dáta počas inštalácie? Zapnutie mobilných dát môže byť spoplatnené.</string>
    <string name="no">Nie</string>
    <string name="yes">Áno</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Tiesňový hovor</string>
    <string name="setup_services">LineageOS funkcie</string>
    <string name="services_explanation" product="tablet">Tieto služby sú určené pre vás a rozširujú možnosti vášho tabletu. Údaje sa použijú v súlade s LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
@@ -61,17 +62,25 @@
    <string name="setup_device_locked">Toto zariadenie bolo uzamknuté používateľom.</string>
    <string name="setup_require_cyanogen_label"><b>Vyžadovať heslo vášho účtu</b> na používanie vášho zariadenia aj po obnove továrenských nastavení.</string>
    <string name="setup_device_locked_instructions"><i>Na vypnutie/zapnutie tejto funkcie prejdite do Nastavenia &gt; Zabezpečenie</i></string>
-    <string name="settings_fingerprint_setup_title">Vyberte záložný typ zamknutia obrazovky</string>
-    <string name="settings_fingerprint_setup_details">Ako chcete zamknúť obrazovku?</string>
+    <string name="settings_biometric_setup_title">Vyberte záložný typ zamknutia obrazovky</string>
+    <string name="settings_biometric_setup_details">Ako chcete zamknúť obrazovku?</string>
    <string name="fingerprint_setup_title">Nastavenie odtlačkov prstov</string>
    <string name="fingerprint_setup_summary">Na použitie vášho snímača odtlačkov prstov na odomknutie obrazovky budete potrebovať:</string>
-    <string name="fingerprint_setup_backup_lock_method">Nastaviť alternatívny spôsob odomknutia</string>
    <string name="fingerprint_setup_add_fingerprint">Pridať váš odtlačok prsta</string>
-    <string name="fingerprint_setup_screen_lock_setup">Nastaviť zamknutie obrazovky</string>
+    <string name="face_setup_title">Nastavenie tváre</string>
+    <string name="face_setup_summary">Pre použitie odomykania obrazovky pomocou tváre, budete potrebovať:</string>
+    <string name="face_setup_add_face">Pridajte svoju tvár</string>
+    <string name="biometric_setup_backup_lock_method">Nastaviť alternatívny spôsob odomknutia</string>
+    <string name="biometric_setup_screen_lock_setup">Nastaviť zamknutie obrazovky</string>
    <string name="sim_locale_changed">Zistená %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Vyberte typ zámku obrazovky</string>
    <string name="settings_lockscreen_setup_details">Ako chcete zamknúť obrazovku?</string>
+    <string name="lockscreen_setup_title" product="tablet">Chráňte svoj tablet</string>
    <string name="lockscreen_setup_title" product="default">Chráňte svoj telefón</string>
    <string name="lockscreen_setup_summary"><b>Chrániť toto zariadenie</b> a pred odomknutím obrazovky vyžiadať kód PIN, gesto alebo heslo</string>
    <string name="lockscreen_setup_screen_lock_setup">Nastaviť</string>
+    <string name="intro_restore_title">Obnoviť aplikácie a dáta</string>
+    <string name="intro_restore_subtitle" product="tablet">Ak máte zálohu zo svojho predošlého tabletu s LineageOS, môžete ju obnoviť tu.</string>
+    <string name="intro_restore_subtitle" product="default">Ak máte zálohu zo svojho predošlého telefónu s LineageOS, môžete ju obnoviť tu.</string>
+    <string name="intro_restore_button">Obnoviť zo záloh</string>
 </resources>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -56,24 +56,31 @@
    <string name="services_explanation" product="default">Te storitve vam omogočajo, da razširite zmogljivosti svojega telefona. Podatki se uporabijo v skladu s <xliff:g id="name" example="Privacy Policy">%s </xliff:g> LineageOS.</string>
    <string name="services_privacy_policy">Pravilnik o zasebnosti</string>
    <string name="services_help_improve_cm">Pomagajte izboljšati <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe LineageOS-a. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe akumulatorja, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> s samodejnim pošiljanjem diagnostičnih podatkov in podatkov uporabe LineageOS-a. Ti podatki se ne uporabljajo za vaše prepoznavanje in ekipi pomagajo pri izboljšanju npr. življenjske dobe baterije, zmogljivosti aplikacij in novih značilnosti <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
    <string name="services_os_nav_keys_label"><b>Uporabite zaslonske tipke za krmarjenje</b> namesto fizičnih tipk.</string>
    <string name="setup_unlock">Odkleni</string>
    <string name="setup_device_locked">To napravo je zaklenil uporabnik.</string>
    <string name="setup_require_cyanogen_label"><b>Zahtevajte svoje geslo računa</b>, da uporabite svojo napravo tudi po ponastavitvi na tovarniške vrednosti.</string>
    <string name="setup_device_locked_instructions"><i>Za vklop/izklop te značilnosti pojdite v Nastavitve &gt; Varnost</i></string>
-    <string name="settings_fingerprint_setup_title">Izberite nadomestni način zaklepanja zaslona</string>
-    <string name="settings_fingerprint_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
+    <string name="settings_biometric_setup_title">Izberite nadomestni način zaklepanja zaslona</string>
+    <string name="settings_biometric_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
    <string name="fingerprint_setup_title">Nastavitev prstnega odtisa</string>
    <string name="fingerprint_setup_summary">Da uporabite tipalo prstnih odtisov za odklepanje zaslona, boste morali:</string>
-    <string name="fingerprint_setup_backup_lock_method">Nastavitev dodatnega načina odklepanja</string>
-    <string name="fingerprint_setup_add_fingerprint">Dodajte vaš prstni odtis</string>
-    <string name="fingerprint_setup_screen_lock_setup">Nastavitev zaklepanja zaslona</string>
+    <string name="fingerprint_setup_add_fingerprint">Dodati vaš prstni odtis</string>
+    <string name="face_setup_title">Nastavitev obraza</string>
+    <string name="face_setup_summary">Da uporabite vaš obraz za odklepanje vašega zaslona, boste morali:</string>
+    <string name="face_setup_add_face">Dodati vaš obraz</string>
+    <string name="biometric_setup_backup_lock_method">Nastaviti dodatni način odklepanja</string>
+    <string name="biometric_setup_screen_lock_setup">Nastavi zaklepanje zaslona</string>
    <string name="sim_locale_changed">%1$s kartica SIM zaznana</string>
    <string name="settings_lockscreen_setup_title">Izberite način zaklepanja zaslona</string>
    <string name="settings_lockscreen_setup_details">Kako bi radi zaklenili svoj zaslon?</string>
    <string name="lockscreen_setup_title" product="tablet">Zaščitite vaš tablični računalnik</string>
    <string name="lockscreen_setup_title" product="default">Zaščitite vaš telefon</string>
-    <string name="lockscreen_setup_summary"><b>Zaščitite to napravo</b> in za odklep zaslona zahtevajte kodo PIN, vzorec ali geslo</string>
+    <string name="lockscreen_setup_summary"><b>Zaščitite to napravo</b> in zahtevajte kodo PIN, vzorec ali geslo za odklep zaslona</string>
    <string name="lockscreen_setup_screen_lock_setup">Nastavi</string>
+    <string name="intro_restore_title">Obnovi aplikacije in podatke</string>
+    <string name="intro_restore_subtitle" product="tablet">Če imate varnostno kopijo iz vašega zadnjega LineageOS tabličnega računalnika, jo lahko obnovite tukaj.</string>
+    <string name="intro_restore_subtitle" product="default">Če imate varnostno kopijo iz vašega zadnjega LineageOS telefona, jo lahko obnovite tukaj.</string>
+    <string name="intro_restore_button">Obnovi iz varnostne kopije</string>
 </resources>
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -18,9 +18,9 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name">Asistenti i Konfigurimit</string>
    <string name="next">Vazhdo</string>
-    <string name="skip">Jo tani</string>
+    <string name="skip">Kapërce</string>
    <string name="start">Fillo</string>
-    <string name="done">Mbarova</string>
+    <string name="done">U krye</string>
    <string name="ok">OK</string>
    <string name="loading">Një sekondë\u2026</string>
    <string name="setup_complete">Konfigurimi u plotësua</string>
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">Kjo pajisje është bllokuar nga përdoruesi.</string>
    <string name="setup_require_cyanogen_label"><b>Kërko vendosjen e fjalëkalimit të llogarisë</b> për të përdorur pajisjen edhe pas rikthimit në gjëndjen e fabrikës.</string>
    <string name="setup_device_locked_instructions"><i>Për të aktivizuar/çaktivizuar këtë funksion, shko tek Parametrat &gt; Siguria</i></string>
-    <string name="settings_fingerprint_setup_title">Zgjidh mënyrën rezervë të bllokimit të ekranit</string>
-    <string name="settings_fingerprint_setup_details">Si doni që ta bllokoni ekranin?</string>
+    <string name="settings_biometric_setup_title">Zgjidh mënyrën rezervë të bllokimit të ekranit</string>
+    <string name="settings_biometric_setup_details">Si doni që ta bllokoni ekranin?</string>
    <string name="fingerprint_setup_title">Konfigurimi i shenjave të gishtave</string>
    <string name="fingerprint_setup_summary">Për të përdorur sensorin e shenjave të gishtave që të zhbllokosh ekranin, duhet të:</string>
-    <string name="fingerprint_setup_backup_lock_method">Konfigurosh një metodë të dytë zhbllokimi</string>
    <string name="fingerprint_setup_add_fingerprint">Shtosh shenjat e gishtave</string>
-    <string name="fingerprint_setup_screen_lock_setup">Konfigurosh bllokimin e ekranit</string>
+    <string name="face_setup_title">Konfigurimi i fytyrës</string>
+    <string name="face_setup_summary">Për të përdorur fytyrën tuaj për të zhbllokuar ekranin tuaj, do të duhet:</string>
+    <string name="face_setup_add_face">Shtoni fytyrën tuaj</string>
+    <string name="biometric_setup_backup_lock_method">Konfigurosh një metodë të dytë zhbllokimi</string>
+    <string name="biometric_setup_screen_lock_setup">Konfigurosh bllokimin e ekranit</string>
    <string name="sim_locale_changed">%1$s SIM u lidh</string>
    <string name="settings_lockscreen_setup_title">Zgjidh mënyrën e bllokimit të ekranit</string>
    <string name="settings_lockscreen_setup_details">Si doni ta bllokoni ekranin?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Mbro telefonin</string>
    <string name="lockscreen_setup_summary"><b>Mbro këtë pajisje</b> dhe vendos një PIN, model, ose fjalëkalim për të zhbllokuar ekranin</string>
    <string name="lockscreen_setup_screen_lock_setup">Konfiguro</string>
+    <string name="intro_restore_title">Rikthe aplikacionet dhe të dhënat</string>
+    <string name="intro_restore_subtitle" product="tablet">Nëse keni një kopje rezervë nga tableti juaj i fundit LineageOS, mund ta ktheni këtu</string>
+    <string name="intro_restore_subtitle" product="default">Nëse keni një kopje rezervë nga tableti juaj i fundit LineageOS, mund ta ktheni këtu</string>
+    <string name="intro_restore_button">Rimerr nga kopja rezervë</string>
 </resources>
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -19,7 +19,7 @@
    <string name="app_name">Чаробњак за подешавање</string>
    <string name="next">Следеће</string>
    <string name="skip">Прескочи</string>
-    <string name="start">Започни</string>
+    <string name="start">Почни</string>
    <string name="done">Готово</string>
    <string name="ok">У реду</string>
    <string name="loading">Само тренутак\u2026</string>
@@ -31,19 +31,19 @@
    <string name="setup_choose_data_sim">Изаберите SIM картицу за пренос података</string>
    <string name="setup_location">Услуге локације</string>
    <string name="setup_other">Друге услуге</string>
-    <string name="setup_datetime">Датум &amp; време</string>
-    <string name="setup_current_date">Данашњи датум</string>
+    <string name="setup_datetime">Датум и време</string>
+    <string name="setup_current_date">Тренутни датум</string>
    <string name="setup_current_time">Тренутно време</string>
    <string name="sim_missing_summary" product="tablet">У таблету није пронађена SIM картица. Прочитајте упутство које сте добили уз уређај да бисте сазнали како да је убаците.</string>
    <string name="sim_missing_summary" product="default">У телефону није пронађена SIM картица. Прочитајте упутство које сте добили уз уређај да бисте сазнали како да је убаците.</string>
    <string name="choose_data_sim_summary" product="tablet">Коју SIM картицу желите да користите за пренос података? Изабрана картица може проузроковати трошкове јер ће се користити за подешавање таблета.</string>
    <string name="choose_data_sim_summary" product="default">Коју SIM картицу желите да користите за пренос података? Изабрана картица може проузроковати трошкове јер ће се користити за подешавање телефона.</string>
-    <string name="date_time_summary">Подесите временску зону и тренутни датум и време, ако је неопходно</string>
-    <string name="backup_data_summary"><b>Сачувајте</b> податке апликација, лозинке Wi-Fi-а и друга подешавања на Google-овим серверима</string>
+    <string name="date_time_summary">Подесите временску зону и тренутни датум и време, ако је неопходно.</string>
+    <string name="backup_data_summary"><b>Сачувајте</b> податке апликација, лозинке Wi-Fi-а и друга подешавања на Google-овим серверима.</string>
    <string name="other_services_summary">Ове услуге дозвољавају Google-у да прошири могућности уређаја. Можете их искључити било кад. Подаци ће бити коришћени у складу са Google-овом <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
    <string name="location_services_summary">Услуге локације дозвољавају систему и инсталираним апликацијама да скупљају и користе податке попут приближне локације. На основу тих података апликација може да, на пример, пронађе кафић у околини.</string>
    <string name="location_access_summary"><b>Дозвољава апликацијама које су затражиле дозволу</b> да користе информације о вашој локацији. Ово може обухватати садашње и прошле локације.</string>
-    <string name="setup_mobile_data">Укључите пренос података</string>
+    <string name="setup_mobile_data">Укључи мобилне податке</string>
    <string name="setup_mobile_data_no_service">Нема мреже</string>
    <string name="setup_mobile_data_emergency_only">Само хитни позиви</string>
    <string name="enable_mobile_data_summary">Желите ли да користите мобилне податке за време подешавања? Укључени пренос података може проузроковати трошкове.</string>
@@ -53,21 +53,21 @@
    <string name="setup_services">Функције LineageOS-а</string>
    <string name="services_explanation" product="tablet">Ове услуге проширују могућности вашег таблета. Подаци ће бити коришћени у складу са <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS-а.</string>
    <string name="services_explanation" product="default">Ове услуге проширују могућности вашег телефона. Подаци ће бити коришћени у складу са <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS-а.</string>
-    <string name="services_privacy_policy">Политика приватности</string>
+    <string name="services_privacy_policy">политиком приватности</string>
    <string name="services_help_improve_cm">Помозите нам да побољшамо <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> слањем дијагностичких података LineageOS-у. Ове информације вас не могу идентификовати и користе се у циљу побољшања трајања батерије, перформанси и додавања нових <xliff:g id="name" example="LineageOS">%2$s</xliff:g> могућности.</string>
-    <string name="services_os_nav_keys_label"><b>Користите навигациону дугмад на екрану</b> уместо физичку.</string>
+    <string name="services_os_nav_keys_label"><b>Користите навигациону дугмад на екрану</b> уместо хардверску.</string>
    <string name="setup_unlock">Откључај</string>
    <string name="setup_device_locked">Корисник је закључао уређај.</string>
    <string name="setup_require_cyanogen_label"><b>Захтевајте лозинку налога</b> за коришћење уређаја, чак и након враћања фабричких подешавања.</string>
-    <string name="setup_device_locked_instructions"><i>Да бисте искључили или укључили ову функцију, идите у мени Подешавања &gt; Безбедност“</i></string>
-    <string name="settings_fingerprint_setup_title">Изаберите алтернативно закључавање екрана</string>
-    <string name="settings_fingerprint_setup_details">Како желите да закључате екран?</string>
+    <string name="setup_device_locked_instructions"><i>Да бисте искључили или укључили ову функцију, идите у мени „Подешавања &gt; Безбедност“</i></string>
+    <string name="settings_biometric_setup_title">Изаберите алтернативно закључавање екрана</string>
+    <string name="settings_biometric_setup_details">Како желите да закључате екран?</string>
    <string name="fingerprint_setup_title">Подешавање сензора за отисак прста</string>
    <string name="fingerprint_setup_summary">Да бисте користили отисак прста за откључавање екрана, неопходно је да:</string>
-    <string name="fingerprint_setup_backup_lock_method">Подесите алтернативни начин откључавања</string>
-    <string name="fingerprint_setup_add_fingerprint">Додајте отисак прста</string>
-    <string name="fingerprint_setup_screen_lock_setup">Подесите закључавање екрана</string>
+    <string name="fingerprint_setup_add_fingerprint">Додате отисак прста</string>
+    <string name="biometric_setup_backup_lock_method">Подесите додатни метод откључавања</string>
+    <string name="biometric_setup_screen_lock_setup">Подесите закључани екран</string>
    <string name="sim_locale_changed">Препозната је %1$s SIM картица</string>
    <string name="settings_lockscreen_setup_title">Изаберите метод закључавања екрана</string>
    <string name="settings_lockscreen_setup_details">Како желите да закључате екран?</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -56,16 +56,17 @@
    <string name="setup_unlock">Lås upp</string>
    <string name="setup_device_locked">Denna enhet har blivit låst av användaren.</string>
    <string name="setup_device_locked_instructions"><i>För att slå av/på denna funktion, gå till Inställningar &gt; Säkerhet</i></string>
-    <string name="settings_fingerprint_setup_title">Välj alternativ skärmlåsningstyp</string>
-    <string name="settings_fingerprint_setup_details">Hur vill du låsa din skärm?</string>
+    <string name="settings_biometric_setup_title">Välj alternativ skärmlåsningstyp</string>
+    <string name="settings_biometric_setup_details">Hur vill du låsa din skärm?</string>
    <string name="fingerprint_setup_title">Konfigurering av fingeravtryck</string>
    <string name="fingerprint_setup_summary">För att använda din fingeravtrycksavläsare för att låsa upp din skärm, behöver du:</string>
-    <string name="fingerprint_setup_backup_lock_method">Konfigurera en sekundär upplåsningsmetod</string>
    <string name="fingerprint_setup_add_fingerprint">Lägga till ditt fingeravtryck</string>
-    <string name="fingerprint_setup_screen_lock_setup">Konfigurera skärmlås</string>
+    <string name="biometric_setup_backup_lock_method">Konfigurera en sekundär upplåsningsmetod</string>
+    <string name="biometric_setup_screen_lock_setup">Konfigurera skärmlås</string>
    <string name="sim_locale_changed">%1$s SIM upptäckt</string>
    <string name="settings_lockscreen_setup_title">Välj skärmlåstyp</string>
    <string name="settings_lockscreen_setup_details">Hur vill du låsa din skärm?</string>
    <string name="lockscreen_setup_title" product="default">Skydda mobilen</string>
    <string name="lockscreen_setup_summary"><b>Skydda den här enheten</b> och kräv pinkod, mönster eller lösenord för att låsa upp skärmen</string>
+    <string name="intro_restore_title">Återställ appar och data</string>
 </resources>
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">தடைநீக்கு</string>
    <string name="setup_device_locked">இந்த சாதனமானது பயனரால் பூட்டப்பட்டது.</string>
    <string name="setup_device_locked_instructions"><i>இந்த அம்சத்தை ஆஃப்/ஆன் செய்ய, தயவுசெய்து செல்லுங்கள் அமைப்புகள் &gt; பாதுகாப்பு</i></string>
-    <string name="settings_fingerprint_setup_title">மறுபிரதி திரை பூட்டு வகையை தேர்வுசெய்க</string>
-    <string name="settings_fingerprint_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
+    <string name="settings_biometric_setup_title">மறுபிரதி திரை பூட்டு வகையை தேர்வுசெய்க</string>
+    <string name="settings_biometric_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
    <string name="fingerprint_setup_title">கைரேகையை அமைக்கவும்</string>
    <string name="fingerprint_setup_summary">உங்கள் கைரேகை உணர்வானைப் பயன்படுத்தி உங்கள் திரையை பூட்டுநீக்க, நீங்கள் இவற்றைச் செய்ய வேண்டும்:</string>
-    <string name="fingerprint_setup_backup_lock_method">ஒரு இரண்டாம்நிலை பூட்டுநீக்க முறையை அமை</string>
    <string name="fingerprint_setup_add_fingerprint">கைரேகையைச் சேர்க்கவும்</string>
-    <string name="fingerprint_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
+    <string name="biometric_setup_backup_lock_method">ஒரு இரண்டாம்நிலை பூட்டுநீக்க முறையை அமை</string>
+    <string name="biometric_setup_screen_lock_setup">திரைப் பூட்டை அமை</string>
    <string name="sim_locale_changed">%1$s SIM கண்டறியப்பட்டது.</string>
    <string name="settings_lockscreen_setup_details">உங்கள் திரையை நீங்கள் எவ்வாறு பூட்ட விரும்புகிறீர்கள்?</string>
    <string name="lockscreen_setup_title" product="default">மொபைலைப் பாதுகாக்கவும்</string>
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">అన్‌లాక్ చేయండి</string>
    <string name="setup_device_locked">ఈ పరికరం వినియోగాదారునిచే లాక్ చేయబడింది.</string>
    <string name="setup_device_locked_instructions"><i>ఈ లక్షణాన్ని ఆఫ్/ఆన్ చేసేందుకు, దయచేసి సెట్టింగులు &gt; సెక్యూరిటీ కు వెళ్ళండి</i></string>
-    <string name="settings_fingerprint_setup_title">నకలు నిల్వ లాక్ రకాన్ని ఎంచుకొనుము</string>
-    <string name="settings_fingerprint_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
+    <string name="settings_biometric_setup_title">నకలు నిల్వ లాక్ రకాన్ని ఎంచుకొనుము</string>
+    <string name="settings_biometric_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
    <string name="fingerprint_setup_title">వేలిముద్ర సెటప్</string>
    <string name="fingerprint_setup_summary">స్క్రీనును అన్లాక్ చేయడానికి మీ యొక్క వేలిముద్ర సెన్సరును ఉపయోగించేందుకు, మీరు ఈ విధంగా చేయాలి:</string>
-    <string name="fingerprint_setup_backup_lock_method">ద్వితీయ అన్లాకింగ్ ప్రక్రియను అమర్చుము</string>
    <string name="fingerprint_setup_add_fingerprint">మీ వేలిముద్రను జోడించండి</string>
-    <string name="fingerprint_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
+    <string name="biometric_setup_backup_lock_method">ద్వితీయ అన్లాకింగ్ ప్రక్రియను అమర్చుము</string>
+    <string name="biometric_setup_screen_lock_setup">సెటప్ స్క్రీన్ లాక్</string>
    <string name="sim_locale_changed">%1$s SIM కనుగొనబడింది</string>
    <string name="settings_lockscreen_setup_details">మీరు మీ స్క్రీనును ఏ విధంగా లాక్ చేయాలని అనుకుంటున్నారు?</string>
    <string name="lockscreen_setup_title" product="default">మీ ఫోన్‌ను రక్షించుకోండి</string>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -62,13 +62,13 @@
    <string name="setup_device_locked">อุปกรณ์นี้ถูกล็อคโดยผู้ใช้</string>
    <string name="setup_require_cyanogen_label"><b>ต้องใช้รหัสผ่านบัญชีของคุณ</b> เพื่อใช้งานอุปกรณ์ของคุณแม้หลังจากรีเซ็ตเป็นค่าโรงงาน</string>
    <string name="setup_device_locked_instructions"><i>เพื่อปิด/เปิดคุณสมบัตินี้ กรุณาไปที่ การตั้งค่า &gt; ความปลอดภัย</i></string>
-    <string name="settings_fingerprint_setup_title">เลือกประเภทการล็อคหน้าจอสำรอง</string>
-    <string name="settings_fingerprint_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
+    <string name="settings_biometric_setup_title">เลือกประเภทการล็อคหน้าจอสำรอง</string>
+    <string name="settings_biometric_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
    <string name="fingerprint_setup_title">การตั้งค่าลายนิ้วมือ</string>
    <string name="fingerprint_setup_summary">ในการใช้เซนเซอร์ลายนิ้วมือเพื่อปลดล็อคหน้าจอ คุณต้อง:</string>
-    <string name="fingerprint_setup_backup_lock_method">กำหนดวิธีปลดล็อคสำรอง</string>
    <string name="fingerprint_setup_add_fingerprint">เพิ่มลายนิ้วมือของคุณ</string>
-    <string name="fingerprint_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
+    <string name="biometric_setup_backup_lock_method">กำหนดวิธีปลดล็อคสำรอง</string>
+    <string name="biometric_setup_screen_lock_setup">ตั้งค่าการล็อคหน้าจอ</string>
    <string name="sim_locale_changed">ตรวจพบซิม %1$s</string>
    <string name="settings_lockscreen_setup_title">เลือกประเภทล็อคหน้าจอ</string>
    <string name="settings_lockscreen_setup_details">คุณต้องการล็อคหน้าจอด้วยวิธีใด</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -55,20 +55,23 @@
    <string name="services_explanation" product="tablet">Bu hizmetler tabletinizin yeteneklerini arttırır. Veriler LineageOS <xliff:g id="name" example="Gizlilik Politikası">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
    <string name="services_explanation" product="default">Bu hizmetler telefonunuzun yeteneklerini arttırır. Veriler LineageOS <xliff:g id="name" example="Gizlilik Politikası">%s</xliff:g> ilkelerine uygun olarak kullanılacaktır.</string>
    <string name="services_privacy_policy">Gizlilik Politikası</string>
-    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g> geliştirmeye yardımcı olun</string>
+    <string name="services_help_improve_cm"><xliff:g id="name" example="LineageOS">%s</xliff:g>\'u geliştirmeye yardımcı olun</string>
    <string name="services_metrics_label">LineageOS\'a tanı ve kullanım verilerini otomatik olarak göndererek <xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g>. Bu bilgiler kimliğinizi ortaya çıkaracak şekilde kullanılmaz ve pil ömrü, uygulama performansı ve yeni <xliff:g id="name" example="LineageOS">%2$s</xliff:g> özellikleri gibi şeylerle uğraşan takımlara yardımcı olur.</string>
    <string name="services_os_nav_keys_label">Donanımsal tuşlar yerine <b>yazılımsal gezinme tuşlarını kullanın</b>.</string>
    <string name="setup_unlock">Kilidi kaldır</string>
    <string name="setup_device_locked">Bu cihaz kullanıcı tarafından kilitlenmiş.</string>
    <string name="setup_require_cyanogen_label"><b>Hesap parolanız</b> cihazınızı sıfırladıktan sonra kullanabilmek için gereklidir.</string>
    <string name="setup_device_locked_instructions"><i>Bu özelliği açıp kapatmak için lütfen Ayarlar &gt; Güvenlik bölümüne gidin</i></string>
-    <string name="settings_fingerprint_setup_title">Yedek ekran kilidi türü seçin</string>
-    <string name="settings_fingerprint_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
+    <string name="settings_biometric_setup_title">Yedek ekran kilidi türü seçin</string>
+    <string name="settings_biometric_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
    <string name="fingerprint_setup_title">Parmak izi kurulumu</string>
    <string name="fingerprint_setup_summary">Ekran kilidini açarken parmak izi sensörünüzü kullanmak için:</string>
-    <string name="fingerprint_setup_backup_lock_method">İkinci kilit açma yönteminizi ayarlayın</string>
    <string name="fingerprint_setup_add_fingerprint">Parmak izinizi ekleyin</string>
-    <string name="fingerprint_setup_screen_lock_setup">Ekran kilidini kurun</string>
+    <string name="face_setup_title">Yüz kurulumu</string>
+    <string name="face_setup_summary">Ekranınızın kilidini açmak üzere yüzünüzü kullanmak için yapmanız gerekenler:</string>
+    <string name="face_setup_add_face">Yüzünü ekleyin</string>
+    <string name="biometric_setup_backup_lock_method">İkinci kilit açma yönteminizi ayarlayın</string>
+    <string name="biometric_setup_screen_lock_setup">Ekran kilidini kurun</string>
    <string name="sim_locale_changed">%1$s SIM tespit edildi</string>
    <string name="settings_lockscreen_setup_title">Ekran kilidi türünü seçin</string>
    <string name="settings_lockscreen_setup_details">Ekranınızı nasıl kilitlemek istersiniz?</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">Telefonunuzu koruyun</string>
    <string name="lockscreen_setup_summary"><b>Bu cihazı koruyun</b> ve ekran kilidini açmak için bir PIN, desen ya da şifreyi gerekli kılın.</string>
    <string name="lockscreen_setup_screen_lock_setup">Kur</string>
+    <string name="intro_restore_title">Uygulamaları ve verileri geri yükleyin</string>
+    <string name="intro_restore_subtitle" product="tablet">Son LineageOS tabletinizden bir yedeğiniz varsa, onu buradan geri yükleyebilirsiniz.</string>
+    <string name="intro_restore_subtitle" product="default">Son LineageOS telefonunuzdan bir yedeğiniz varsa, onu buradan geri yükleyebilirsiniz.</string>
+    <string name="intro_restore_button">Yedekten geri yükle</string>
 </resources>
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -53,13 +53,13 @@
    <string name="setup_unlock">قۇلۇپ ئېچىش</string>
    <string name="setup_device_locked">بۇ ئۈسكىنى باشقىلار قۇلۇپلاپ قويغان.</string>
    <string name="setup_device_locked_instructions"><i>بۇ ئىقىتىدارنى ئېچىپ تاقاش ئۈچۈن، تەڭشەكلەر&gt; بىخەتەرلىككە كىرىڭ</i></string>
-    <string name="settings_fingerprint_setup_title">زاپاس قۇلۇپ تىپىنى تاللاڭ</string>
-    <string name="settings_fingerprint_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
+    <string name="settings_biometric_setup_title">زاپاس قۇلۇپ تىپىنى تاللاڭ</string>
+    <string name="settings_biometric_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
    <string name="fingerprint_setup_title">بارماق ئىزى تەڭشىكى</string>
    <string name="fingerprint_setup_summary">ئۆزىڭىزنىڭ بارماق داتچىكنى ئىشلىتىپ قۇلۇپ ئاچماقچى بولسىڭىز، سىز چوقۇم:</string>
-    <string name="fingerprint_setup_backup_lock_method">زاپاس قۇلۇپ يىيىش ئۇسۇلىنى بېكىتىڭ</string>
    <string name="fingerprint_setup_add_fingerprint">بارماق ئىزى قوشۇڭ</string>
-    <string name="fingerprint_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
+    <string name="biometric_setup_backup_lock_method">زاپاس قۇلۇپ يىيىش ئۇسۇلىنى بېكىتىڭ</string>
+    <string name="biometric_setup_screen_lock_setup">ئېكران قۇلۇپ تەڭشىكى</string>
    <string name="sim_locale_changed">ھازىر %1$s دانە SIM كارتا بايقىدى</string>
    <string name="settings_lockscreen_setup_details">ئېكراننى قانداق قۇلۇپلايسىز؟</string>
 </resources>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -38,10 +38,10 @@
    <string name="sim_missing_summary" product="default">У вашому телефоні не виявлено SIM-карти. Щоб дізнатися як вставити SIM-карту, ознайомтеся з інструкціями до вашого пристрою.</string>
    <string name="choose_data_sim_summary" product="tablet">Яку SIM-карту використовувати для передачі даних? Це може коштувати вам грошей, тому що обрана SIM-карта буде використана для отримання налаштувань планшету.</string>
    <string name="choose_data_sim_summary" product="default">Яку SIM-карту використовувати для передачі даних? Це може коштувати вам грошей, тому що, обрана SIM-карта буде використана для отримання налаштувань вашого пристрою.</string>
-    <string name="date_time_summary">Встановіть часовий пояс і настройте поточну дату та час, якщо це необхідно</string>
+    <string name="date_time_summary">Оберіть часовий пояс і виправте за потреби дату й час</string>
    <string name="backup_data_summary"><b>Зберегти</b> дані додатків, Wi-Fi паролі та інші параметри на серверах Google</string>
    <string name="other_services_summary">Ці служби дозволяють Google розширити можливості пристрою. Ви маєте можливість вимкнути їх в будь-який час. Дані будуть використані відповідно до <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
-    <string name="location_services_summary">Служби місцезнаходження дозволяють системі і додаткам збирати та використовувати дані, щодо вашого приблизного розташування. Наприклад, додаток зможе шукати кав\'ярні чи зупинки, що розташовані поруч, ґрунтуючись на отриманих даних.</string>
+    <string name="location_services_summary">Служби місцезнаходження дозволяють системі і додаткам збирати та використовувати дані, щодо вашого приблизного розташування. Наприклад, додаток зможе шукати кав`ярні чи зупинки, що розташовані поруч, грунтуючись на отриманих даних.</string>
    <string name="location_access_summary"><b>Дозволити програмам, котрі запитали вашого дозволу</b> використовувати інформацію, щодо вашого місцезнаходження. Це може бути як ваше поточне, так і минулі розташування.</string>
    <string name="setup_mobile_data">Увімкнути мобільні дані</string>
    <string name="setup_mobile_data_no_service">Немає мережі</string>
@@ -60,17 +60,18 @@
    <string name="setup_device_locked">Цей пристрій заблоковано користувачем.</string>
    <string name="setup_require_cyanogen_label"><b>Необхідний пароль</b> для використання Вашого пристрою навіть після скидання до заводських налаштувань.</string>
    <string name="setup_device_locked_instructions"><i>Щоб увімкнути/вимкнути цю функцію, будь ласка, перейдіть до Налаштування &gt; Безпека</i></string>
-    <string name="settings_fingerprint_setup_title">Виберіть резервний спосіб розблокування екрана</string>
-    <string name="settings_fingerprint_setup_details">Як би ви хотіли блокувати екран?</string>
+    <string name="settings_biometric_setup_title">Виберіть резервний спосіб розблокування екрана</string>
+    <string name="settings_biometric_setup_details">Як би ви хотіли блокувати екран?</string>
    <string name="fingerprint_setup_title">Налаштування відбитку пальця</string>
    <string name="fingerprint_setup_summary">Щоб використовувати датчик відбитків пальців, ви маєте:</string>
-    <string name="fingerprint_setup_backup_lock_method">Встановлення резервного методу розблокування</string>
    <string name="fingerprint_setup_add_fingerprint">Додати ваш відбиток пальця</string>
-    <string name="fingerprint_setup_screen_lock_setup">Налаштування блокування екрану</string>
+    <string name="biometric_setup_backup_lock_method">Встановлення резервного методу розблокування</string>
+    <string name="biometric_setup_screen_lock_setup">Налаштування блокування екрану</string>
    <string name="sim_locale_changed">%1$s SIM-карту виявлено</string>
    <string name="settings_lockscreen_setup_title">Виберіть тип блокування екрану</string>
    <string name="settings_lockscreen_setup_details">Як би ви хотіли блокувати екран?</string>
    <string name="lockscreen_setup_title" product="default">Захистіть свій телефон</string>
    <string name="lockscreen_setup_summary"><b>Захистити цей пристрій</b> та запитувати PIN-код, графічний ключ або пароль для розблокування екрану</string>
    <string name="lockscreen_setup_screen_lock_setup">Налаштувати</string>
+    <string name="intro_restore_title">Відновіть застосунки й дані</string>
 </resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">Bạn có muốn sử dụng dữ liệu di động trong lúc thiết lập? Bật dữ liệu di động có thể phải chịu phí dữ liệu.</string>
    <string name="no">Không</string>
    <string name="yes">Có</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">Cuộc gọi khẩn cấp</string>
    <string name="setup_services">Các tính năng LineageOS</string>
    <string name="services_explanation" product="tablet">Các dịch vụ này giúp mở rộng khả năng làm việc máy tính bảng của bạn. Dữ liệu sẽ được sử dụng theo LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
@@ -61,17 +62,25 @@
    <string name="setup_device_locked">Thiết bị này đã bị khoá bởi người dùng.</string>
    <string name="setup_require_cyanogen_label"><b>Yêu cầu mật khẩu tài khoản của bạn</b> để sử dụng thiết bị của bạn ngay cả sau khi đặt lại cài đặt gốc.</string>
    <string name="setup_device_locked_instructions"><i>Để bật/tắt tính năng này, hãy truy cập Cài đặt &gt; bảo mật</i></string>
-    <string name="settings_fingerprint_setup_title">Chọn kiểu khóa màn hình dự phòng</string>
-    <string name="settings_fingerprint_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
+    <string name="settings_biometric_setup_title">Chọn kiểu khóa màn hình dự phòng</string>
+    <string name="settings_biometric_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
    <string name="fingerprint_setup_title">Thiết lập vân tay</string>
    <string name="fingerprint_setup_summary">Để sử dụng cảm biến vân tay của bạn để mở khóa màn hình của bạn, bạn sẽ cần phải:</string>
-    <string name="fingerprint_setup_backup_lock_method">Thiết lập phương thức mở khóa phụ</string>
    <string name="fingerprint_setup_add_fingerprint">Thêm vân tay của bạn</string>
-    <string name="fingerprint_setup_screen_lock_setup">Thiết lập khóa màn hình</string>
+    <string name="face_setup_title">Thiết lập khuôn mặt</string>
+    <string name="face_setup_summary">Để sử dụng mở khóa bằng khuôn mặt, bạn cần phải:</string>
+    <string name="face_setup_add_face">Thêm khuôn mặt của bạn</string>
+    <string name="biometric_setup_backup_lock_method">Thiết lập phương thức mở khóa phụ</string>
+    <string name="biometric_setup_screen_lock_setup">Thiết lập khóa màn hình</string>
    <string name="sim_locale_changed">Đã phát hiện %1$s SIM</string>
    <string name="settings_lockscreen_setup_title">Chọn kiểu khóa màn hình</string>
    <string name="settings_lockscreen_setup_details">Bạn muốn khóa màn hình của bạn như thế nào?</string>
+    <string name="lockscreen_setup_title" product="tablet">Bảo vệ máy tính bảng của bạn</string>
    <string name="lockscreen_setup_title" product="default">Bảo vệ điện thoại của bạn</string>
    <string name="lockscreen_setup_summary"><b>Bảo vệ thiết bị này</b> và yêu cầu mã PIN, hình hoặc mật khẩu để mở khóa màn hình</string>
    <string name="lockscreen_setup_screen_lock_setup">Thiết lập</string>
+    <string name="intro_restore_title">Khôi phục Sao lưu</string>
+    <string name="intro_restore_subtitle" product="tablet">Nếu bạn có bản sao lưu gần đây nhất từ máy tính bảng sử dụng LineageOS, bạn có thể khôi phục nó tại đây.</string>
+    <string name="intro_restore_subtitle" product="default">Nếu bạn có bản sao lưu gần đây nhất từ điện thoại sử dụng LineageOS, bạn có thể khôi phục nó tại đây.</string>
+    <string name="intro_restore_button">Khôi phục từ bản sao lưu</string>
 </resources>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -62,13 +62,16 @@
    <string name="setup_device_locked">此设备的持有者锁定了该设备。</string>
    <string name="setup_require_cyanogen_label"><b>需要您的帐户密码</b>以使用您的设备，甚至在重置之后。</string>
    <string name="setup_device_locked_instructions"><i>要开启或关闭此功能，请进入设置 &gt; 安全</i></string>
-    <string name="settings_fingerprint_setup_title">选择备用屏幕锁定类型</string>
-    <string name="settings_fingerprint_setup_details">您希望如何锁定您的屏幕？</string>
+    <string name="settings_biometric_setup_title">选择备用屏幕锁定类型</string>
+    <string name="settings_biometric_setup_details">您希望如何锁定您的屏幕？</string>
    <string name="fingerprint_setup_title">指纹设置</string>
    <string name="fingerprint_setup_summary">若要使用您的指纹传感器解锁您的屏幕，您需要：</string>
-    <string name="fingerprint_setup_backup_lock_method">设置备用解锁方式</string>
    <string name="fingerprint_setup_add_fingerprint">添加您的指纹</string>
-    <string name="fingerprint_setup_screen_lock_setup">设置屏幕锁定</string>
+    <string name="face_setup_title">人脸识别设置</string>
+    <string name="face_setup_summary">要使用您的脸来解锁您的屏幕，您需要：</string>
+    <string name="face_setup_add_face">添加您的脸</string>
+    <string name="biometric_setup_backup_lock_method">设置备用解锁方式</string>
+    <string name="biometric_setup_screen_lock_setup">设置屏幕锁定</string>
    <string name="sim_locale_changed">检测到 %1$s SIM 卡</string>
    <string name="settings_lockscreen_setup_title">选择屏幕锁定类型</string>
    <string name="settings_lockscreen_setup_details">您希望如何锁定您的屏幕？</string>
@@ -76,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">为您的手机启用保护功能</string>
    <string name="lockscreen_setup_summary"><b>为此设备启用保护功能</b>，并要求输入 PIN 码、图案或密码才能解锁屏幕</string>
    <string name="lockscreen_setup_screen_lock_setup">设置</string>
+    <string name="intro_restore_title">恢复应用和数据</string>
+    <string name="intro_restore_subtitle" product="tablet">如果你有来自你上一台 LineageOS 平板的备份，你可以在这里还原它。</string>
+    <string name="intro_restore_subtitle" product="default">如果你有来自你上一台 LineageOS 手机的备份，你可以在这里还原它。</string>
+    <string name="intro_restore_button">从备份中还原</string>
 </resources>
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -48,12 +48,12 @@
    <string name="services_os_nav_keys_label"><b>使用虛擬按鍵</b>而非實體按鍵。</string>
    <string name="setup_unlock">解鎖</string>
    <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請至設定 &gt; 安全性</i></string>
-    <string name="settings_fingerprint_setup_title">選擇備用螢幕鎖類型</string>
-    <string name="settings_fingerprint_setup_details">您希望如何鎖定螢幕？</string>
+    <string name="settings_biometric_setup_title">選擇備用螢幕鎖類型</string>
+    <string name="settings_biometric_setup_details">您希望如何鎖定螢幕？</string>
    <string name="fingerprint_setup_title">指紋感應設定</string>
    <string name="fingerprint_setup_summary">若要使用指紋感應器來解鎖螢幕，您需要：</string>
-    <string name="fingerprint_setup_backup_lock_method">設定第二個解鎖方式</string>
    <string name="fingerprint_setup_add_fingerprint">新增您的指紋</string>
-    <string name="fingerprint_setup_screen_lock_setup">設定螢幕鎖定</string>
+    <string name="biometric_setup_backup_lock_method">設定第二個解鎖方式</string>
+    <string name="biometric_setup_screen_lock_setup">設定螢幕鎖定</string>
    <string name="settings_lockscreen_setup_details">您希望如何鎖定螢幕？</string>
 </resources>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -49,6 +49,7 @@
    <string name="enable_mobile_data_summary">您想在設定過程中使用行動數據嗎？使用行動數據可能會產生傳輸費用。</string>
    <string name="no">否</string>
    <string name="yes">是</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
    <string name="emergency_call">緊急電話</string>
    <string name="setup_services">LineageOS 功能</string>
    <string name="services_explanation" product="tablet">這些服務用來增強您的平板的功能。資料將根據 LineageOS 的 <xliff:g id="name" example="Privacy Policy">%s</xliff:g> 來使用。</string>
@@ -61,13 +62,16 @@
    <string name="setup_device_locked">已被使用者鎖定此裝置。</string>
    <string name="setup_require_cyanogen_label"><b>需要您的帳戶密碼</b> 即可使用您的裝置，即使在重設裝置之後。</string>
    <string name="setup_device_locked_instructions"><i>如要開啟/關閉此功能，請到設定 &gt; 安全性</i></string>
-    <string name="settings_fingerprint_setup_title">選擇備用螢幕鎖定類型</string>
-    <string name="settings_fingerprint_setup_details">您想如何鎖定畫面？</string>
+    <string name="settings_biometric_setup_title">選擇備用螢幕鎖定類型</string>
+    <string name="settings_biometric_setup_details">您想如何鎖定畫面？</string>
    <string name="fingerprint_setup_title">指紋設定</string>
    <string name="fingerprint_setup_summary">若要使用您的指紋感應器解鎖您的螢幕，您需要︰</string>
-    <string name="fingerprint_setup_backup_lock_method">設定第二個解鎖方式</string>
    <string name="fingerprint_setup_add_fingerprint">新增您的指紋</string>
-    <string name="fingerprint_setup_screen_lock_setup">設定畫面鎖定</string>
+    <string name="face_setup_title">臉部辨識設定</string>
+    <string name="face_setup_summary">若要使用臉部辨識來解鎖螢幕，您需要：</string>
+    <string name="face_setup_add_face">新增您的臉部</string>
+    <string name="biometric_setup_backup_lock_method">設定第二個解鎖方式</string>
+    <string name="biometric_setup_screen_lock_setup">設定畫面鎖定</string>
    <string name="sim_locale_changed">檢測到 %1$s 張 SIM 卡</string>
    <string name="settings_lockscreen_setup_title">選擇螢幕鎖類型</string>
    <string name="settings_lockscreen_setup_details">您想如何鎖定畫面？</string>
@@ -75,4 +79,8 @@
    <string name="lockscreen_setup_title" product="default">保護您的手機</string>
    <string name="lockscreen_setup_summary"><b>保護這個裝置</b>，並需要輸入 PIN 碼、解鎖圖案或密碼解除螢幕鎖定</string>
    <string name="lockscreen_setup_screen_lock_setup">設定</string>
+    <string name="intro_restore_title">恢復應用程式和資料</string>
+    <string name="intro_restore_subtitle" product="tablet">如果您有上一個 LineageOS 平板電腦的備份，可以在這裡恢復它。</string>
+    <string name="intro_restore_subtitle" product="default">如果您有上一個 LineageOS 平板電腦的備份，可以在這裡恢復它。</string>
+    <string name="intro_restore_button">從備份還原</string>
 </resources>
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -31,5 +31,5 @@
    <color name="header_bg">@color/primary</color>
    <color name="header_condensed_bg">@color/primary</color>
    <color name="button_bar_background">@color/primary</color>
-    <color name="fingerprint_setup_text_color">#167C80</color>
+    <color name="biometric_setup_text_color">#167C80</color>
 </resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -80,14 +80,17 @@
    <string name="setup_require_cyanogen_label"><b>Require your account password</b> in order to use your device even after a factory reset.</string>
    <string name="setup_device_locked_instructions"><i>To turn this feature off/on, please go to Settings > Security</i></string>

-    <!-- Fingerprint setup -->
-    <string name="settings_fingerprint_setup_title">Select backup screen lock type</string>
-    <string name="settings_fingerprint_setup_details">How would you like to lock your screen?</string>
+    <!-- Biometric setup -->
+    <string name="settings_biometric_setup_title">Select backup screen lock type</string>
+    <string name="settings_biometric_setup_details">How would you like to lock your screen?</string>
    <string name="fingerprint_setup_title">Fingerprint setup</string>
    <string name="fingerprint_setup_summary">To use your fingerprint sensor to unlock your screen, you\'ll need to:</string>
-    <string name="fingerprint_setup_backup_lock_method">Setup a secondary unlock method</string>
    <string name="fingerprint_setup_add_fingerprint">Add your fingerprint</string>
-    <string name="fingerprint_setup_screen_lock_setup">Setup screen lock</string>
+    <string name="face_setup_title">Face setup</string>
+    <string name="face_setup_summary">To use your face to unlock your screen, you\'ll need to:</string>
+    <string name="face_setup_add_face">Add your face</string>
+    <string name="biometric_setup_backup_lock_method">Setup a secondary unlock method</string>
+    <string name="biometric_setup_screen_lock_setup">Setup screen lock</string>
    <string name="sim_locale_changed">%1$s SIM detected</string>

    <!-- secure lock screen -->
--- a/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
+++ b/src/org/lineageos/setupwizard/BaseSetupWizardActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,12 +17,14 @@

 package org.lineageos.setupwizard;

+import static android.view.View.INVISIBLE;
 import static com.google.android.setupcompat.util.ResultCodes.RESULT_ACTIVITY_NOT_FOUND;
 import static com.google.android.setupcompat.util.ResultCodes.RESULT_RETRY;
 import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;

 import static org.lineageos.setupwizard.SetupWizardApp.ACTION_EMERGENCY_DIAL;
 import static org.lineageos.setupwizard.SetupWizardApp.ACTION_NEXT;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ACTION_ID;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_FIRST_RUN;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_HAS_MULTIPLE_USERS;
@@ -36,7 +38,10 @@ import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.net.wifi.WifiManager;
@@ -75,7 +80,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
    protected static final int EMERGENCY_DIAL_ACTIVITY_REQUEST = 10038;
    protected static final int WIFI_ACTIVITY_REQUEST = 10004;
    protected static final int BLUETOOTH_ACTIVITY_REQUEST = 10100;
-    protected static final int FINGERPRINT_ACTIVITY_REQUEST = 10101;
+    protected static final int BIOMETRIC_ACTIVITY_REQUEST = 10101;
    protected static final int SCREENLOCK_ACTIVITY_REQUEST = 10102;

    private static final int IMMERSIVE_FLAGS =
@@ -89,8 +94,20 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
    private boolean mIsFirstRun = true;
    protected boolean mIsGoingBack = false;
    private boolean mIsPrimaryUser;
-    private int mResultCode = 0;
+    protected int mResultCode = 0;
    private Intent mResultData;
+    private final BroadcastReceiver finishReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (ACTION_SETUP_COMPLETE.equals(intent.getAction())) {
+                if (BaseSetupWizardActivity.this instanceof FinishActivity) return;
+                if (mNavigationBar != null) {
+                    // hide the activity's view, so it does not pop up again
+                    mNavigationBar.getRootView().setVisibility(INVISIBLE);
+                }
+            }
+        }
+    };

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -98,6 +115,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
            logActivityState("onCreate savedInstanceState=" + savedInstanceState);
        }
        super.onCreate(savedInstanceState);
+        registerReceiver(finishReceiver, new IntentFilter(ACTION_SETUP_COMPLETE));
        mIsPrimaryUser = UserHandle.myUserId() == 0;
        initLayout();
        mNavigationBar = getNavigationBar();
@@ -169,6 +187,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
        if (LOGV) {
            logActivityState("onDestroy");
        }
+        unregisterReceiver(finishReceiver);
        super.onDestroy();
    }

@@ -307,7 +326,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
            Animation fadeOut = AnimationUtils.loadAnimation(this, android.R.anim.fade_out);
            final Button next = mNavigationBar.getNextButton();
            next.startAnimation(fadeOut);
-            next.setVisibility(View.INVISIBLE);
+            next.setVisibility(INVISIBLE);
        }
    }

@@ -515,12 +534,12 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
            Animation fadeOut = AnimationUtils.loadAnimation(this, android.R.anim.fade_out);
            final Button back = mNavigationBar.getBackButton();
            back.startAnimation(fadeOut);
-            back.setVisibility(View.INVISIBLE);
+            back.setVisibility(INVISIBLE);
        }
    }

    protected int getTransition() {
-        return TRANSITION_ID_DEFAULT;
+        return TRANSITION_ID_SLIDE;
    }

    protected boolean tryEnablingWifi() {
@@ -591,8 +610,8 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
            case BLUETOOTH_ACTIVITY_REQUEST:
                sb.append("BLUETOOTH_ACTIVITY_REQUEST");
                break;
-            case FINGERPRINT_ACTIVITY_REQUEST:
-                sb.append("FINGERPRINT_ACTIVITY_REQUEST");
+            case BIOMETRIC_ACTIVITY_REQUEST:
+                sb.append("BIOMETRIC_ACTIVITY_REQUEST");
                break;
            case SCREENLOCK_ACTIVITY_REQUEST:
                sb.append("SCREENLOCK_ACTIVITY_REQUEST");
@@ -633,7 +652,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
                    default:
                        break;
                }
-            case FINGERPRINT_ACTIVITY_REQUEST:
+            case BIOMETRIC_ACTIVITY_REQUEST:
                switch (resultCode) {
                    case RESULT_OK:
                        sb.append("RESULT_OK");
@@ -642,7 +661,7 @@ public abstract class BaseSetupWizardActivity extends Activity implements Naviga
                        sb.append("RESULT_CANCELED");
                        break;
                    case RESULT_SKIP:
-                        sb.append("RESULT_FINGERPRINT_SKIP");
+                        sb.append("RESULT_BIOMETRIC_SKIP");
                        break;
                    default:
                        break;
--- a/src/org/lineageos/setupwizard/FingerprintActivity.java
+++ b/src/org/lineageos/setupwizard/FingerprintActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@

 package org.lineageos.setupwizard;

-import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_FINGERPRINT;
+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_BIOMETRIC;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_ALLOW_SKIP;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_AUTO_FINISH;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_DETAILS;
@@ -26,54 +26,75 @@ import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_MATERIAL_LIGHT;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_THEME;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_TITLE;
 import static org.lineageos.setupwizard.SetupWizardApp.EXTRA_USE_IMMERSIVE;
-import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_FINGERPRINT;
+import static org.lineageos.setupwizard.SetupWizardApp.REQUEST_CODE_SETUP_BIOMETRIC;

 import android.content.Intent;
+import android.os.Bundle;
 import android.view.View;
+import android.widget.TextView;

-public class FingerprintActivity extends SubBaseActivity {
+import com.google.android.setupcompat.util.WizardManagerHelper;

-    public static final String TAG = FingerprintActivity.class.getSimpleName();
+import org.lineageos.setupwizard.util.SetupWizardUtils;
+
+public class BiometricActivity extends SubBaseActivity {
+
+    public static final String TAG = BiometricActivity.class.getSimpleName();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        final TextView setupBiometricSummary = (TextView) findViewById(R.id.setup_biometric_summary);
+        final TextView setupAddBiometric = (TextView) findViewById(R.id.setup_add_biometric);
+        if (SetupWizardUtils.hasFace(this)) {
+            setupBiometricSummary.setText(getString(R.string.face_setup_summary));
+            setupAddBiometric.setText(R.string.face_setup_add_face);
+        } else {
+            setupBiometricSummary.setText(getString(R.string.fingerprint_setup_summary));
+            setupAddBiometric.setText(R.string.fingerprint_setup_add_fingerprint);
+        }
+    }

    @Override
    protected void onStartSubactivity() {
        setNextAllowed(true);
-        findViewById(R.id.setup_fingerprint).setOnClickListener(view -> launchFingerprintSetup());
+        findViewById(R.id.setup_biometric).setOnClickListener(view -> launchBiometricSetup());
    }

    @Override
    protected int getLayoutResId() {
-        return R.layout.setup_fingerprint;
+        return R.layout.setup_biometric;
    }

    @Override
    protected int getTitleResId() {
+        if (SetupWizardUtils.hasFace(this)) {
+            return R.string.face_setup_title;
+        }
        return R.string.fingerprint_setup_title;
    }

    @Override
    protected int getIconResId() {
+        if (SetupWizardUtils.hasFace(this)) {
+            return R.drawable.ic_face;
+        }
        return R.drawable.ic_fingerprint;
    }

-    private void launchFingerprintSetup() {
-        Intent intent = new Intent(ACTION_SETUP_FINGERPRINT);
+    private void launchBiometricSetup() {
+        Intent intent = new Intent(ACTION_SETUP_BIOMETRIC);
        intent.putExtra(EXTRA_FIRST_RUN, true);
        intent.putExtra(EXTRA_ALLOW_SKIP, true);
        intent.putExtra(EXTRA_USE_IMMERSIVE, true);
        intent.putExtra(EXTRA_THEME, EXTRA_MATERIAL_LIGHT);
        intent.putExtra(EXTRA_AUTO_FINISH, false);
-            /*intent.putExtra(LockPatternUtils.LOCKSCREEN_FINGERPRINT_FALLBACK, true);*/
+            /*intent.putExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_FALLBACK, true);*/
        intent.putExtra(EXTRA_TITLE,
-                getString(R.string.settings_fingerprint_setup_title));
+                getString(getTitleResId()));
        intent.putExtra(EXTRA_DETAILS,
-                getString(R.string.settings_fingerprint_setup_details));
-        startSubactivity(intent, REQUEST_CODE_SETUP_FINGERPRINT);
+                getString(R.string.settings_biometric_setup_details));
+        intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
+        startSubactivity(intent, REQUEST_CODE_SETUP_BIOMETRIC);
    }
-
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
 }
--- a/src/org/lineageos/setupwizard/BluetoothSetupActivity.java
+++ b/src/org/lineageos/setupwizard/BluetoothSetupActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import android.util.Log;

 import org.lineageos.setupwizard.util.SetupWizardUtils;

-public class BluetoothSetupActivity extends SubBaseActivity {
+public class BluetoothSetupActivity extends WrapperSubBaseActivity {

    public static final String TAG = BluetoothSetupActivity.class.getSimpleName();

--- a/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
+++ b/src/org/lineageos/setupwizard/CaptivePortalSetupActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import android.net.CaptivePortal;
 import android.net.ConnectivityManager;
 import android.net.ICaptivePortal;
 import android.os.AsyncTask;
-import android.provider.Settings;
 import android.util.Log;

 import java.io.IOException;
@@ -34,21 +33,20 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Random;

-public class CaptivePortalSetupActivity extends SubBaseActivity {
+public class CaptivePortalSetupActivity extends WrapperSubBaseActivity {

    public static final String TAG = CaptivePortalSetupActivity.class.getSimpleName();

-    private static final String DEFAULT_SERVER = "clients3.google.com";
    private static final int CAPTIVE_PORTAL_SOCKET_TIMEOUT_MS = 10000;

    private URL mCaptivePortalUrl;

    @Override
    protected void onStartSubactivity() {
-        String server = Settings.Global.getString(getContentResolver(), "captive_portal_server");
-        if (server == null) server = DEFAULT_SERVER;
+        ConnectivityManager connectivity = getSystemService(ConnectivityManager.class);
+
        try {
-            mCaptivePortalUrl = new URL("http://" + server + "/generate_204");
+            mCaptivePortalUrl = new URL(connectivity.getCaptivePortalServerUrl());
        } catch (MalformedURLException e) {
            Log.e(TAG, "Not a valid url" + e);
        }
@@ -56,11 +54,6 @@ public class CaptivePortalSetupActivity extends SubBaseActivity {
                .checkForCaptivePortal(mCaptivePortalUrl, this, true);
    }

-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_FADE;
-    }
-
    private static class CheckForCaptivePortalTask extends AsyncTask<Void, Void, Boolean> {

        private final URL captivePortalUrl;
--- a/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
+++ b/src/org/lineageos/setupwizard/ChooseDataSimActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -229,11 +229,6 @@ public class ChooseDataSimActivity extends BaseSetupWizardActivity {
        }
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    private void checkForRadioReady() {
        if (mRadioReady) {
            mHandler.removeCallbacks(mRadioReadyRunnable);
--- a/src/org/lineageos/setupwizard/DateTimeActivity.java
+++ b/src/org/lineageos/setupwizard/DateTimeActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -159,11 +159,6 @@ public class DateTimeActivity extends BaseSetupWizardActivity implements
        unregisterReceiver(mIntentReceiver);
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.setup_datetime_page;
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2019 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@

 package org.lineageos.setupwizard;

+import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
 import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_BUTTON_BACKLIGHT;
 import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
@@ -45,6 +46,9 @@ import org.lineageos.setupwizard.util.EnableAccessibilityController;

 import lineageos.providers.LineageSettings;

+import static android.os.Binder.getCallingUserHandle;
+import static org.lineageos.setupwizard.Manifest.permission.FINISH_SETUP;
+
 public class FinishActivity extends BaseSetupWizardActivity {

    public static final String TAG = FinishActivity.class.getSimpleName();
@@ -73,11 +77,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
        setNextText(R.string.start);
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.finish_activity;
@@ -86,7 +85,9 @@ public class FinishActivity extends BaseSetupWizardActivity {
    @Override
    public void finish() {
        super.finish();
-        overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit);
+        if (!isResumed() || mResultCode != RESULT_CANCELED) {
+            overridePendingTransition(R.anim.translucent_enter, R.anim.translucent_exit);
+        }
    }

    @Override
@@ -103,6 +104,10 @@ public class FinishActivity extends BaseSetupWizardActivity {
    }

    private void startFinishSequence() {
+        Intent i = new Intent(ACTION_SETUP_COMPLETE);
+        i.setPackage(getPackageName());
+        sendBroadcastAsUser(i, getCallingUserHandle(), FINISH_SETUP);
+
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
        hideBackButton();
        hideNextButton();
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017-2019 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -134,19 +134,9 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
    }

    @Override
-    public void onNavigateBack() {
-        onBackPressed();
-    }
-
-    @Override
-    public void onNavigateNext() {
+    protected void onNextPressed() {
        Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK);
-        startActivityForResult(intent, 1);
-    }
-
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
+        nextAction(NEXT_REQUEST, intent);
    }

    @Override
--- a/src/org/lineageos/setupwizard/LocaleActivity.java
+++ b/src/org/lineageos/setupwizard/LocaleActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -105,11 +105,6 @@ public class LocaleActivity extends BaseSetupWizardActivity {
        }
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.setup_locale;
--- a/src/org/lineageos/setupwizard/LocationSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LocationSettingsActivity.java
@@ -59,11 +59,6 @@ public class LocationSettingsActivity extends BaseSetupWizardActivity {
        mLocationAccess.setChecked(mLocationManager.isLocationEnabled());
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.location_settings;
--- a/src/org/lineageos/setupwizard/MobileDataActivity.java
+++ b/src/org/lineageos/setupwizard/MobileDataActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -179,11 +179,6 @@ public class MobileDataActivity extends BaseSetupWizardActivity {
        mPhoneMonitor.removeListener(mSubscriptionStateListener);
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    private void hideWaitForRadio() {
        if (mProgressBar.isShown()) {
            mHandler.removeCallbacks(mRadioReadyRunnable);
--- a/src/org/lineageos/setupwizard/ScreenLockActivity.java
+++ b/src/org/lineageos/setupwizard/ScreenLockActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -51,11 +51,6 @@ public class ScreenLockActivity extends SubBaseActivity {
        });
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.setup_lockscreen;
@@ -81,11 +76,6 @@ public class ScreenLockActivity extends SubBaseActivity {
        startSubactivity(intent, REQUEST_CODE_SETUP_LOCKSCREEN);
    }

-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    private boolean isKeyguardSecure() {
        return getSystemService(KeyguardManager.class).isKeyguardSecure();
    }
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2013 The CyanogenMod Project
- * Copyright (C) 2017-2019 The LineageOS Project
+ * Copyright (C) 2017-2021 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,9 +35,10 @@ public class SetupWizardApp extends Application {
    /* Verbose Logging */
    public static final boolean LOGV = Log.isLoggable(TAG, Log.VERBOSE);

+    public static final String ACTION_SETUP_COMPLETE = "org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE";
    public static final String ACTION_FINISHED = "org.lineageos.setupwizard.SETUP_FINISHED";
    public static final String ACTION_SETUP_WIFI = "android.net.wifi.PICK_WIFI_NETWORK";
-    public static final String ACTION_SETUP_FINGERPRINT = "android.settings.FINGERPRINT_SETUP";
+    public static final String ACTION_SETUP_BIOMETRIC = "android.settings.BIOMETRIC_ENROLL";
    public static final String ACTION_SETUP_LOCKSCREEN = "com.android.settings.SETUP_LOCK_SCREEN";
    public static final String ACTION_RESTORE_FROM_BACKUP = "com.stevesoltys.seedvault.RESTORE_BACKUP";
    public static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
@@ -59,6 +60,7 @@ public class SetupWizardApp extends Application {
    public static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
    public static final String EXTRA_PREFS_SHOW_BUTTON_BAR = "extra_prefs_show_button_bar";
    public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
+    public static final String EXTRA_IS_SETUP_FLOW = "isSetupFlow";

    public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";
    public static final String KEY_SEND_METRICS = "send_metrics";
@@ -68,7 +70,7 @@ public class SetupWizardApp extends Application {
    public static final int REQUEST_CODE_SETUP_WIFI = 0;
    public static final int REQUEST_CODE_SETUP_CAPTIVE_PORTAL= 4;
    public static final int REQUEST_CODE_SETUP_BLUETOOTH= 5;
-    public static final int REQUEST_CODE_SETUP_FINGERPRINT = 7;
+    public static final int REQUEST_CODE_SETUP_BIOMETRIC = 7;
    public static final int REQUEST_CODE_SETUP_LOCKSCREEN = 9;
    public static final int REQUEST_CODE_RESTORE = 10;

@@ -91,6 +93,7 @@ public class SetupWizardApp extends Application {
        NetworkMonitor.initInstance(this);
        PhoneMonitor.initInstance(this);
        SetupWizardUtils.disableComponentsForMissingFeatures(this);
+        SetupWizardUtils.setMobileDataEnabled(this, false);
        mHandler.postDelayed(mRadioTimeoutRunnable, SetupWizardApp.RADIO_READY_TIMEOUT);
    }

--- a/src/org/lineageos/setupwizard/SimMissingActivity.java
+++ b/src/org/lineageos/setupwizard/SimMissingActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -67,11 +67,6 @@ public class SimMissingActivity extends BaseSetupWizardActivity {
        }
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.sim_missing_page;
--- a/src/org/lineageos/setupwizard/SubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/SubBaseActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -40,6 +40,10 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {

    protected abstract void onStartSubactivity();

+    protected void onSubactivityCanceled(Intent data) {
+        // Do nothing.
+    }
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        if (LOGV) {
@@ -142,22 +146,16 @@ public abstract class SubBaseActivity extends BaseSetupWizardActivity {
            nextAction(RESULT_ACTIVITY_NOT_FOUND);
            finish();
        } else {
-            applyBackwardTransition(getSubactivityPreviousTransition());
-            finishAction(RESULT_CANCELED, data);
+            onSubactivityCanceled(data);
        }
    }

    protected int getSubactivityPreviousTransition() {
-        return TRANSITION_ID_DEFAULT;
+        return TRANSITION_ID_SLIDE;
    }

    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_DEFAULT;
-    }
-
-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_FADE;
+        return TRANSITION_ID_SLIDE;
    }

    @Override
--- a/src/org/lineageos/setupwizard/WelcomeActivity.java
+++ b/src/org/lineageos/setupwizard/WelcomeActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -52,11 +52,6 @@ public class WelcomeActivity extends BaseSetupWizardActivity {
        startEmergencyDialer();
    }

-    @Override
-    protected int getTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    @Override
    protected int getLayoutResId() {
        return R.layout.welcome_activity;
--- a/src/org/lineageos/setupwizard/WifiSetupActivity.java
+++ b/src/org/lineageos/setupwizard/WifiSetupActivity.java
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2016 The CyanogenMod Project
- * Copyright (C) 2017 The LineageOS Project
+ * Copyright (C) 2017-2018,2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import android.content.Intent;

 import org.lineageos.setupwizard.util.SetupWizardUtils;

-public class WifiSetupActivity extends SubBaseActivity {
+public class WifiSetupActivity extends WrapperSubBaseActivity {

    public static final String TAG = WifiSetupActivity.class.getSimpleName();

@@ -40,10 +40,4 @@ public class WifiSetupActivity extends SubBaseActivity {
        intent.putExtra(SetupWizardApp.EXTRA_PREFS_SET_BACK_TEXT, (String) null);
        startSubactivity(intent, REQUEST_CODE_SETUP_WIFI);
    }
-
-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
 }
--- a/src/org/lineageos/setupwizard/WrapperSubBaseActivity.java
+++ b/src/org/lineageos/setupwizard/WrapperSubBaseActivity.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2020 The LineageOS Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.lineageos.setupwizard;
+
+import android.content.Intent;
+
+public abstract class WrapperSubBaseActivity extends SubBaseActivity {
+
+    @Override
+    protected void onSubactivityCanceled(Intent data) {
+        super.onSubactivityCanceled(data);
+
+        // As the subactivity we're wrapping finishes, we finish too
+        applyBackwardTransition(getSubactivityPreviousTransition());
+        finishAction(RESULT_CANCELED, data);
+    }
+
+}
--- a/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
+++ b/src/org/lineageos/setupwizard/backup/RestoreIntroActivity.java
@@ -1,5 +1,6 @@
 /*
 * Copyright (C) 2019-2020 The Calyx Institute
+ * Copyright (C) 2020 The LineageOS Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,7 +17,11 @@

 package org.lineageos.setupwizard.backup;

+import android.app.Activity;
 import android.content.Intent;
+
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
 import org.lineageos.setupwizard.R;
 import org.lineageos.setupwizard.SubBaseActivity;

@@ -32,6 +37,12 @@ public class RestoreIntroActivity extends SubBaseActivity {
        findViewById(R.id.intro_restore_button).setOnClickListener(v -> launchRestore());
    }

+    @Override
+    protected void onNextPressed() {
+        Intent intent = WizardManagerHelper.getNextIntent(getIntent(), Activity.RESULT_OK);
+        nextAction(NEXT_REQUEST, intent);
+    }
+
    @Override
    protected int getLayoutResId() {
        return R.layout.intro_restore_activity;
@@ -47,11 +58,6 @@ public class RestoreIntroActivity extends SubBaseActivity {
        return R.drawable.ic_restore;
    }

-    @Override
-    protected int getSubactivityNextTransition() {
-        return TRANSITION_ID_SLIDE;
-    }
-
    private void launchRestore() {
        Intent intent = new Intent(ACTION_RESTORE_FROM_BACKUP);
        startSubactivity(intent, REQUEST_CODE_RESTORE);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Michael Bestas	8648a78589	Automatic translation import Change-Id: I66da73c79bb494d63cc007ac8ac3d8cd09b5d4f9	2024-02-08 04:29:07 +02:00
Michael Bestas	af2d91fc27	Automatic translation import Change-Id: I72048f0341e491d6221040f30384c604db06b1ec	2022-02-13 02:57:41 +02:00
Michael W	319e8c030a	Automatic translation import Change-Id: I87ca3786547a0595cc885126f09d50852bd084cc	2022-01-12 20:47:44 +01:00
Michael W	1131f34170	Automatic translation import Change-Id: I7e5eb07ba0327cad6ae0b3182fe6cbcddbdfa587	2022-01-08 13:54:40 +01:00
LineageOS Builder	6e41cef44d	Automatic translation import Change-Id: I4dfcad83f9f6b34e2efa6f1ff2f1b8becce65078	2021-05-16 12:19:49 +00:00
LineageOS Builder	8ff9c97c6f	Automatic translation import Change-Id: I250f388d96b9d6ed54aa8660e2e2888583797498	2021-04-19 15:22:33 +02:00
LineageOS Builder	35692f0442	Automatic translation import Change-Id: I1dc4d059dd367f529c2522a688cc2534b5c2254a	2021-04-19 10:02:57 +00:00
Michael W	c5f841dd0d	SetupWizard: Disable mobile data at least once * Right now, the user has to set the toggle on and off to actually get the setting set to "off", since the underlying default value is "on" * Make sure to send an "off" initially right at the beginning of SuW Change-Id: Iec2fd05ea341351f3e6d4b195a1a385f9d88d4f7 (cherry picked from commit `29e77749c5`)	2021-03-28 10:14:02 +05:30
Luca Stefani	4050f8e233	SetupWizard: Remove libphonenumber dep * This is likely an artifact of the {cm,lineage}sdk transition that included this lib * Now the lib is only included in a separate library to avoid unnecessary disk waste Change-Id: Ib12acac080f4a2271a118470951a06cd014a91aa (cherry picked from commit `bc224d5750`)	2021-03-17 23:39:42 +01:00
LineageOS Builder	1cad6ae069	Automatic translation import Change-Id: Id18ed3c31bf97b3d88c46ede8c44c3a687e5cbba	2021-03-01 10:03:39 +00:00
LineageOS Builder	57604444cd	Automatic translation import Change-Id: I5f73983a9e0264925c86f885068adc8bde39e1ed	2021-01-15 10:07:11 +00:00
LineageOS Builder	542c8e3a9d	Automatic translation import Change-Id: Ice8a9a6694dd9fe833c0dba7c0b0be40452f9ed0	2021-01-01 10:06:28 +00:00
Daniel Micay	0ea955de20	Use system captive portal URL The captive_portal_server setting is deprecated, and hard-wiring it as a string is also probably a bad idea. Since it's deprecated, this code will miss an override via the modern settings. This also hard-wired a slightly different fallback than ConnectivityService, and simply adjusting it here wouldn't stop that from happening again. It's best to just use the privileged API for obtaining the proper value. The choice of LOCAL_MAC_ADDRESS as the permission for this is a bit strange, but that's what is required, probably because a better fit didn't exist. Change-Id: I78d07d5ff96598cebf6d4ed032fe1516791836fe	2020-12-18 18:17:14 +01:00
LineageOS Builder	d6af60c46f	Automatic translation import Change-Id: I69a7daaa440b2e04c18bcbe6df5914152382a9f5	2020-12-15 12:30:15 +00:00
LineageOS Builder	3d03d8e6b1	Automatic translation import Change-Id: I1dc1230e1c690489ee03e413e1d9d84428ffe92b	2020-12-01 13:59:31 +00:00
Michael Bestas	578a6c99e2	SetupWizard: Add seedvault restore page in GMS flow Change-Id: I1ce86864b4a8d0477cd2db77a3820583e24c758a	2020-11-18 21:39:46 +02:00
Chirayu Desai	619798ec2b	translations: Rename fingerprint setup string to biometric setup For: I9ddd7b46548c8107239fdec457bbaae6b12876e6 Change-Id: Ic315f4ccf97edda45de000f41ba4cb456c249d29	2020-11-13 22:28:21 +01:00
Chirayu Desai	103ac80d23	Switch fingerprint setup to biometric setup instead * Generic, handles both face and fingerprint * Works the same as before for fingerprint * Works the same as fingerprint for face * What else could one ask for? Change-Id: I9ddd7b46548c8107239fdec457bbaae6b12876e6	2020-11-13 22:28:21 +01:00
Torsten Grote	799d3cb3b3	Hide activities when setup finishes, so they don't pop up at the end Change-Id: Ica6b5babf7df7a7d8033ecd7694e3f45144b363a	2020-11-13 22:28:21 +01:00
Alessandro Astone	8ab720a45d	SetupWizard: Distinguish interactive and wrapper subactivities We were using the SubBaseActivity class for two different kind of activities: (1) "Wrapper" activities, where we define an activity that on start simply launches another one (2) "Interactive" activities, where the user has to manually trigger the start of the subactivity, or skip the step. When the subactivity ends, only in case (1) we want to finish our activity as well, since we wouldn't have anything to show. Change-Id: I1a3ae51f6146ac32b5e7542d9a18b0b032efe144	2020-11-13 23:14:48 +02:00
Christian Oder	b27895be85	LSW: Properly set page transition and cleanup definitions on the way Set slide animation by default and use it in all pages. Fix wrong/missing slide animations on various transitions like WiFi and the backup subpage. Change-Id: I78c87f38eb615379d39c89b43a016ed2ffb98695	2020-11-13 13:44:30 +02:00
Christian Oder	1229f410b7	LSW: Fix backtrack to LineageSettings fragment The current handling results in the followup activity to ignore it for backtracks which means when going from Location -> LineageSettings -> Fingerprint the move backwards from Fingerprint leads up in Location and not the expected LineageSettings. The custom handling is necessary to process the result in the Google SUW, so it has been fixed to properly work now. Change-Id: Ifae5dc8fda07b61bd0271da1d1589059ab40cd39	2020-11-13 13:31:36 +02:00