Automatic translation import

Change-Id: I1aaecec76732a76215a29b09cecd6999de978e46

Android.bp

@@ -0,0 +1,53 @@
+//
+// Copyright (C) 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.
+// 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.
+//
+
+android_app {
+    name: "LineageSetupWizard",
+
+    srcs: ["src/**/*.java"],
+
+    certificate: "platform",
+    privileged: true,
+    system_ext_specific: true,
+    platform_apis: true,
+
+    overrides: ["Provision"],
+
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
+
+    static_libs: [
+        "androidx.core_core",
+        "SettingsLib",
+        "setupcompat",
+        "setupdesign",
+        "SystemUISharedLib",
+        "org.lineageos.platform.internal",
+    ],
+
+    libs: ["telephony-common"],
+
+    required: ["privapp_whitelist_org.lineageos.setupwizard"],
+}
+
+prebuilt_etc {
+    name: "privapp_whitelist_org.lineageos.setupwizard",
+    system_ext_specific: true,
+    src: "privapp_whitelist_org.lineageos.setupwizard.xml",
+    sub_dir: "permissions",
+    filename_from_src: true,
+}

Android.mk

@@ -1,45 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_PACKAGE_NAME := LineageSetupWizard
-LOCAL_CERTIFICATE := platform
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Provision
-
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.flags
-
-LOCAL_STATIC_ANDROID_LIBRARIES := \
-    androidx.core_core \
-    setupcompat \
-    setupdesign
-
-LOCAL_STATIC_JAVA_LIBRARIES := \
-    libphonenumber \
-    org.lineageos.platform.internal
-
-LOCAL_JAVA_LIBRARIES := \
-    telephony-common
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_USE_AAPT2 := true
-
-LOCAL_REQUIRED_MODULES := privapp_whitelist_org.lineageos.setupwizard.xml
-
-include $(BUILD_PACKAGE)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := privapp_whitelist_org.lineageos.setupwizard.xml
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/permissions
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
-     Copyright (C) 2017,2019 The LineageOS Project
+     Copyright (C) 2017-2022 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.
@@ -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.NETWORK_SETTINGS" />
     <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"/>
 
@@ -82,6 +86,7 @@
                   android:excludeFromRecents="true"
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:immersive="true"
+                  android:exported="true"
                   android:windowSoftInputMode="stateAlwaysHidden"
                   android:theme="@style/NoDisplay">
 
@@ -98,6 +103,7 @@
                   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_BLUETOOTH_SETUP" />
@@ -110,6 +116,7 @@
                   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_WELCOME" />
@@ -122,6 +129,7 @@
                   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_LOCALE" />
@@ -134,6 +142,7 @@
                   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_DATETIME" />
@@ -141,32 +150,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".WifiSetupActivity"
-                  android:label="@string/activity_label_empty"
-                  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_WIFI_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".CaptivePortalSetupActivity"
-                  android:label="@string/activity_label_empty"
-                  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_CAPTIVE_PORTAL_SETUP" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".SimMissingActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
@@ -180,7 +163,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ChooseDataSimActivity"
+        <activity android:name=".NetworkSetupActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
@@ -188,12 +171,12 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".MobileDataActivity"
+        <activity android:name=".CaptivePortalSetupActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
@@ -201,7 +184,7 @@
                   android:exported="false"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
-                <action android:name="org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA" />
+                <action android:name="org.lineageos.setupwizard.LINEAGE_CAPTIVE_PORTAL_SETUP" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
@@ -219,11 +202,37 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".UpdateRecoveryActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="true"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".DeviceSpecificActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:immersive="true"
+                  android:exported="true"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.DEVICE_SPECIFIC"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
         <activity android:name=".LineageSettingsActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
                   android:immersive="true"
+                  android:exported="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="org.lineageos.setupwizard.LINEAGE_SETTINGS" />
@@ -231,7 +240,20 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".FingerprintActivity"
+        <activity android:name=".NavigationSettingsActivity"
+                  android:label="@string/activity_label_empty"
+                  android:excludeFromRecents="true"
+                  android:configChanges="mcc|mnc"
+                  android:immersive="true"
+                  android:exported="true"
+                  android:windowSoftInputMode="stateAlwaysHidden">
+            <intent-filter>
+                <action android:name="org.lineageos.setupwizard.NAVIGATION_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name=".BiometricActivity"
                   android:label="@string/activity_label_empty"
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
@@ -239,7 +261,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 +284,7 @@
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
                   android:immersive="true"
-                  android:exported="false"
+                  android:exported="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP"/>
@@ -275,6 +297,7 @@
                   android:excludeFromRecents="true"
                   android:configChanges="mcc|mnc"
                   android:immersive="true"
+                  android:exported="true"
                   android:windowSoftInputMode="stateAlwaysHidden">
             <intent-filter>
                 <action android:name="org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE" />
@@ -286,6 +309,7 @@
                   android:configChanges="keyboard|keyboardHidden|mcc|mnc|orientation|screenSize"
                   android:excludeFromRecents="true"
                   android:immersive="true"
+                  android:exported="false"
                   android:label="@@string/activity_label_empty"
                   android:theme="@style/NoDisplay">
             <intent-filter>
@@ -302,7 +326,8 @@
                   android:launchMode="singleInstance"
                   android:theme="@style/NoDisplay"/>
 
-        <receiver android:name=".PartnerReceiver">
+        <receiver android:name=".PartnerReceiver"
+                  android:exported="true">
             <intent-filter>
                 <action android:name="com.android.setupwizard.action.PARTNER_CUSTOMIZATION" />
                 <action android:name="com.google.android.tvsetup.action.PARTNER_CUSTOMIZATION" />

exit_wizard.sh

@@ -2,12 +2,19 @@
 
 adb root
 wait ${!}
+has_google_suw=$(adb shell pm list packages com.google.android.setupwizard)
 adb shell pm enable org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
-wait ${!}
-adb shell pm enable com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity || true
-wait ${!}
+if [[ ! -z "$has_google_suw" ]]
+then
+    wait ${!}
+    adb shell pm enable com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity || true
+    wait ${!}
+fi
 sleep 1
 adb shell am start org.lineageos.setupwizard/org.lineageos.setupwizard.SetupWizardExitActivity || true
-wait ${!}
-sleep 1
-adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity
+if [[ ! -z "$has_google_suw" ]]
+then
+    wait ${!}
+    sleep 1
+    adb shell am start com.google.android.setupwizard/com.google.android.setupwizard.SetupWizardExitActivity
+fi

res/drawable/ic_chevron_left_dark.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/button_bar_text"
-        android:pathData="M15.41,7.41L14,6l-6,6l6,6l1.41-1.41L10.83,12L15.41,7.41Z" />
-</vector>

res/drawable/ic_chevron_right_dark.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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/button_bar_text"
-        android:pathData="M10,6L8.59,7.41L13.17,12l-4.58,4.59L10,18l6-6L10,6Z" />
-</vector>

res/drawable/ic_dialer.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2017 The LineageOS Project
+    Copyright (c) 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.
@@ -21,10 +21,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
-        android:fillAlpha=".3"
-        android:pathData="M2 22h20V2z" />
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M17 7L2 22h15z" />
+        android:fillColor="?android:colorControlNormal"
+        android:pathData="M20,15.5C18.8,15.5 17.5,15.3 16.4,14.9C16.3,14.9 16.2,14.9 16.1,14.9C15.8,14.9 15.6,15 15.4,15.2L13.2,17.4C10.4,15.9 8,13.6 6.6,10.8L8.8,8.6C9.1,8.3 9.2,7.9 9,7.6C8.7,6.5 8.5,5.2 8.5,4C8.5,3.5 8,3 7.5,3H4C3.5,3 3,3.5 3,4C3,13.4 10.6,21 20,21C20.5,21 21,20.5 21,20V16.5C21,16 20.5,15.5 20,15.5M5,5H6.5C6.6,5.9 6.8,6.8 7,7.6L5.8,8.8C5.4,7.6 5.1,6.3 5,5M19,19C17.7,18.9 16.4,18.6 15.2,18.2L16.4,17C17.2,17.2 18.1,17.4 19,17.4V19Z" />
 </vector>

res/drawable/ic_eye.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2017 The LineageOS Project
+    Copyright (c) 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.
@@ -21,9 +21,6 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/black"
-        android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
-19 19 17.59 13.41 12z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
+        android:fillColor="?android:colorControlNormal"
+        android:pathData="M12,9A3,3 0 0,1 15,12A3,3 0 0,1 12,15A3,3 0 0,1 9,12A3,3 0 0,1 12,9M12,4.5C17,4.5 21.27,7.61 23,12C21.27,16.39 17,19.5 12,19.5C7,19.5 2.73,16.39 1,12C2.73,7.61 7,4.5 12,4.5M3.18,12C4.83,15.36 8.24,17.5 12,17.5C15.76,17.5 19.17,15.36 20.82,12C19.17,8.64 15.76,6.5 12,6.5C8.24,6.5 4.83,8.64 3.18,12Z" />
 </vector>

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>

res/drawable/ic_launcher_background.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:fillColor="#ffffff"/>
+</vector>

res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group>
+    <clip-path
+        android:pathData="M0,0h108v108h-108z"/>
+    <path
+        android:pathData="M53.671,54.898C53.707,54.605 53.744,54.312 53.744,54C53.744,53.688 53.707,53.395 53.671,53.102L55.651,51.598C55.834,51.47 55.87,51.213 55.761,51.012L53.872,47.84C53.762,47.638 53.506,47.565 53.304,47.638L50.957,48.555C50.462,48.188 49.931,47.895 49.362,47.657L48.995,45.218C48.995,44.998 48.794,44.833 48.556,44.833H44.797C44.559,44.833 44.357,44.998 44.32,45.218L43.954,47.638C43.386,47.858 42.854,48.188 42.359,48.537L40.012,47.62C39.792,47.528 39.554,47.62 39.444,47.822L37.556,50.993C37.445,51.213 37.5,51.452 37.684,51.598L39.664,53.102C39.627,53.395 39.609,53.707 39.609,54C39.609,54.312 39.646,54.605 39.682,54.898L37.684,56.42C37.5,56.548 37.464,56.805 37.574,57.007L39.462,60.178C39.572,60.38 39.829,60.453 40.03,60.38L42.377,59.463C42.872,59.83 43.404,60.123 43.972,60.362L44.339,62.782C44.357,63.002 44.559,63.167 44.797,63.167H48.574C48.812,63.167 49.014,63.002 49.032,62.782L49.399,60.362C49.967,60.142 50.499,59.812 50.994,59.463L53.34,60.38C53.561,60.472 53.799,60.38 53.909,60.178L55.797,57.007C55.907,56.805 55.87,56.567 55.687,56.42L53.671,54.898ZM46.667,57.208C44.852,57.208 43.367,55.778 43.367,54C43.367,52.222 44.852,50.792 46.667,50.792C48.482,50.792 49.967,52.222 49.967,54C49.967,55.778 48.5,57.208 46.667,57.208ZM66.834,33.852L48.5,33.833C46.484,33.833 44.834,35.483 44.834,37.5V43H48.5V41.167H66.834V66.833H48.5V65H44.834V70.5C44.834,72.517 46.484,74.167 48.5,74.167H66.834C68.851,74.167 70.501,72.517 70.501,70.5V37.5C70.501,35.483 68.851,33.852 66.834,33.852Z"
+        android:fillColor="#167C80"/>
+    <path
+        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
+        android:fillAlpha="0.6">
+      <aapt:attr name="android:fillColor">
+        <gradient
+            android:gradientRadius="72"
+            android:centerX="28.54"
+            android:centerY="28.54"
+            android:type="radial">
+          <item android:offset="0" android:color="#19FFFFFF"/>
+          <item android:offset="1" android:color="#00FFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

res/drawable/ic_navigation.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M4.59,6.89C5.29,6.18 6,5.54 6.3,5.67C6.8,5.87 6.3,6.7 6,7.19C5.75,7.61 3.14,11.08 3.14,13.5C3.14,14.78 3.62,15.84 4.5,16.5C5.23,17.04 6.22,17.21 7.12,16.94C8.19,16.63 9.07,15.54 10.18,14.17C11.39,12.68 13,10.73 14.26,10.73C15.89,10.73 15.91,11.74 16,12.5C12.24,13.16 10.64,16.19 10.64,17.89C10.64,19.59 12.08,21 13.85,21C15.5,21 18.14,19.65 18.54,14.88H21V12.38H18.53C18.38,10.73 17.44,8.18 14.5,8.18C12.25,8.18 10.32,10.09 9.56,11C9,11.75 7.5,13.5 7.27,13.74C7,14.04 6.59,14.58 6.16,14.58C5.71,14.58 5.44,13.75 5.8,12.66C6.15,11.57 7.2,9.8 7.65,9.14C8.43,8 8.95,7.22 8.95,5.86C8.95,3.69 7.31,3 6.44,3C5.12,3 3.97,4 3.72,4.25C3.36,4.61 3.06,4.91 2.84,5.18L4.59,6.89M13.88,18.55C13.57,18.55 13.14,18.29 13.14,17.83C13.14,17.23 13.87,15.63 16,15.07C15.71,17.76 14.58,18.55 13.88,18.55Z" />
+
+</vector>

res/drawable/ic_signal_0.xml

@@ -1,26 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#e0e0e0"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
-</vector>

res/drawable/ic_signal_1.xml

@@ -1,29 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#e0e0e0"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M11.300000,12.700000l-9.300000,9.300000 9.300000,0.000000z"/>
-</vector>

res/drawable/ic_signal_2.xml

@@ -1,29 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#e0e0e0"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M14.000000,10.000000l-12.000000,12.000000 12.000000,0.000000z"/>
-</vector>

res/drawable/ic_signal_3.xml

@@ -1,29 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#e0e0e0"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M16.700001,7.300000l-14.700001,14.700000 14.700001,0.000000z"/>
-</vector>

res/drawable/ic_signal_4.xml

@@ -1,26 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000 0.000000,-20.000000z"/>
-</vector>

res/drawable/ic_signal_no_signal.xml

@@ -1,26 +0,0 @@
-<!--
-    Copyright (C) 2014 The Android Open Source Project
-    Copyright (c) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#e0e0e0"
-        android:pathData="M2.000000,22.000000l20.000000,0.000000L22.000000,2.000000L2.000000,22.000000zM20.000000,20.000000L6.800000,20.000000L20.000000,6.800000L20.000000,20.000000z"/>
-</vector>

res/drawable/ic_system_update.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2017 The LineageOS Project
+    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.
@@ -15,14 +15,11 @@
     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:pathData="M0 0h24v24H0z" />
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/black"
-        android:pathData="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z" />
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z"/>
 </vector>

res/drawable/logo.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2017 The LineageOS Project
+    Copyright (c) 2017, 2022 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,35 +16,12 @@
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="512dp"
-    android:height="320dp"
+    android:height="260dp"
     android:viewportWidth="512"
-    android:viewportHeight="320">
+    android:viewportHeight="260">
 
     <path
-        android:fillColor="@color/accent"
-        android:pathData="M157.89,271.64a1.83,1.83,0,0,1-1.89-1.89V248.42h4.65v19.32H171v3.9Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M185,271.64V248.42h4.68v23.22Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M221.17,248.42h4.26v22a1.23,1.23,0,0,1-.67,1.09,3.17,3.17,0,0,1-1.67 .41
-,4,4,0,0,1-1.71-.29,3.11,3.11,0,0,1-1.12-1L210,256v15.61h-4.32v-21.5a1.56,1.56,0,0,1,.68-1.4,3.18,3.18,0,0,1,1.79-.46,3.59,3.59,0,0,1,1.9
-.39 ,5.91,5.91,0,0,1,1.41,1.56l9.72,13.59Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M256.9,252.36H246.2v5.5h9.63v3.93H246.2v5.89H256.6v4H241.51V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52h13.4Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M286.38,271.64l-2-5.76h-8.49l-2,5.76h-4.85l7.87-21.5q.68-1.85,3.15-1.85t3.19,1.89l7.87,21.46ZM277.27,262h5.82l-2.93-8.62Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M314.33,272a11,11,0,0,1-8.36-3.19,11.93,11.93,0,0,1-3.06-8.62,12.12,12.12,0,0,1,3.25-8.89,11.56,11.56,0,0,1,8.62-3.3,11.44,11.44,0,0,1,6,1.5,9,9,0,0,1,3.63,3.93l-3.74,2q-1.69-3.41-6-3.41a6.53,6.53,0,0,0-5.14,2.16,8.58,8.58,0,0,0-1.92,5.9,8.67,8.67,0,0,0,1.79,5.8,6.11,6.11,0,0,0,4.91,2.1,6.74,6.74,0,0,0,4.6-1.58,5.26,5.26,0,0,0,1.87-4h-5.89v-3.67h10.5v2.57a10.19,10.19,0,0,1-3.12,7.72A11.12,11.12,0,0,1,314.33,272Z" />
-    <path
-        android:fillColor="@color/accent"
-        android:pathData="M356,252.36H345.3v5.5h9.63v3.93H345.3v5.89h10.41v4H340.62V250.31a1.74,1.74,0,0,1,.59-1.37,2,2,0,0,1,1.4-.52H356Z" />
-    <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/lineage_accent"
         android:pathData="M416,128a39.92,39.92,0,0,0-31.11,14.87l-1.5-.6A294.79,294.79,0,0,0,336,128.14s0-.09,0-.14a80,80,0,1,0-160,0s0,.09,0,.13l-1.72
 .38 a293.48,293.48,0,0,0-45.67,13.76l-1.5 .6
 a40,40,0,1,0,7.39,14.28h0a277.33,277.33,0,0,1,43.1-13,80,80,0,0,0,156.73,0,277.3,277.3,0,0,1,43.11,13h0A40,40,0,1,0,416,128ZM96,192a24,24,0,1,1,24-24A24,24,0,0,1,96,192Zm160,0a64,64,0,1,1,64-64A64.07,64.07,0,0,1,256,192Zm160,0a24,24,0,1,1,24-24A24,24,0,0,1,416,192ZM288,128a32,32,0,1,1-32-32A32,32,0,0,1,288,128Z" />

res/drawable/timelapse.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2017 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.
--->
-<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="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59
-19 19 17.59 13.41 12z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>

res/layout-land/sim_missing_page.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/PageContent">
-
-            <TextView
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:id="@+id/sim_missing"
-                style="@style/PageSummaryText"
-                android:textSize="15sp"
-                android:layout_marginBottom="@dimen/summary_margin_bottom"
-                android:paddingLeft="@dimen/content_margin_left"
-                android:paddingRight="@dimen/content_margin_right"
-                android:text="@string/sim_missing_summary" />
-
-            <ImageView
-                android:id="@+id/sim_slot_image"
-                android:layout_width="0px"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:scaleType="fitEnd"
-                android:src="@drawable/sim"/>
-
-        </LinearLayout>
-    </FrameLayout>
-</LinearLayout>

res/layout-television/welcome_activity.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The CyanogenMod Project
+                   2017-2022 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@style/SudContentFrame">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:weightSum="100"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/brand_logo"
+            android:layout_width="wrap_content"
+            android:layout_height="0dp"
+            android:layout_weight="65"
+            android:layout_gravity="center"
+            android:src="@drawable/logo"
+            android:adjustViewBounds="true"
+            android:scaleType="fitCenter"
+            android:gravity="center"
+            android:paddingTop="@dimen/content_margin_top"
+            android:paddingRight="@dimen/content_margin_left"
+            android:paddingLeft="@dimen/content_margin_left"
+            android:paddingBottom="0dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="35"
+            android:gravity="center_vertical"
+            android:orientation="vertical">
+            <TextView
+                style="@style/WelcomeTitle"
+                android:id="@+id/welcome_title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hyphenationFrequency="none"
+                android:gravity="center" />
+            <Button
+                android:id="@+id/start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/start"
+                style="@style/SudGlifButton.Primary" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:visibility="gone">
+
+        <Button
+            android:id="@+id/emerg_dialer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_dialer"
+            android:text="@string/emergency_call"
+            style="@style/SudGlifButton.Secondary" />
+
+        <Button
+            android:id="@+id/launch_accessibility"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_eye"
+            android:text="@string/accessibility_settings"
+            style="@style/SudGlifButton.Secondary" />
+
+    </LinearLayout>
+</LinearLayout>

res/layout/choose_data_sim_page.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
-
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <ScrollView android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:fillViewport="true">
-
-            <LinearLayout
-                android:id="@+id/page_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/PageContent"
-                android:visibility="gone">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/PageSummaryText"
-                    android:textSize="15sp"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:paddingBottom="@dimen/summary_margin_bottom"
-                    android:text="@string/choose_data_sim_summary" />
-
-                <include layout="@layout/divider" />
-
-            </LinearLayout>
-        </ScrollView>
-
-        <ProgressBar
-            android:id="@+id/progress"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:indeterminateOnly="true"
-            android:layout_width="match_parent"
-            android:layout_height="8dp"
-            android:layout_gravity="top"
-            android:visibility="gone"/>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>

res/layout/data_sim_row.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/sim_row"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:minHeight="?android:attr/listPreferredItemHeight"
-              android:gravity="center_vertical"
-              android:paddingLeft="@dimen/content_margin_left"
-              android:paddingRight="@dimen/data_switch_margin_right"
-              android:background="?android:attr/selectableItemBackground"
-              android:clickable="true">
-
-    <ImageView
-        android:id="@+id/signal"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_signal_0" />
-
-    <TextView
-        android:id="@+id/sim_title"
-        android:layout_width="0px"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:textSize="14sp"
-        android:layout_marginLeft="@dimen/carrier_text_margin_left"
-        android:maxLines="4" />
-
-    <CheckBox
-        android:id="@+id/enable_check"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:duplicateParentState="true"
-        android:clickable="false"/>
-
-</LinearLayout>

res/layout/finish_activity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The CyanogenMod Project
-     Copyright (C) 2017 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.
@@ -29,7 +29,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@color/primary">
+        style="@style/SudContentFrame">
 
         <ImageView
             android:id="@+id/brand_logo"
@@ -42,18 +42,18 @@
             android:gravity="center"
             android:padding="@dimen/content_margin_left"/>
 
-        <com.google.android.setupdesign.view.NavigationBar
+        <org.lineageos.setupwizard.NavigationLayout
             android:id="@+id/navigation_bar"
-            style="@style/SudNavBarTheme"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/sud_navbar_height" />
+            android:layout_height="wrap_content" />
 
     </LinearLayout>
 
-    <ImageView android:id="@+id/reveal"
-               android:layout_width="match_parent"
-               android:layout_height="match_parent"
-               android:background="@drawable/reveal"
-               android:visibility="invisible"/>
+    <ImageView
+        android:id="@+id/reveal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/reveal"
+        android:visibility="invisible"/>
 
 </org.lineageos.setupwizard.widget.ScrimInsetsFrameLayout>

res/layout/header_condensed.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 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.
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/header_condensed_height"
-    android:paddingTop="48dp"
-    android:orientation="vertical">
-
-    <ImageView
-        android:id="@+id/header_icon"
-        android:layout_width="64dp"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:visibility="gone"
-        android:contentDescription="@null" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_toEndOf="@id/header_icon"
-        android:paddingEnd="8dp"
-        android:typeface="monospace"
-        android:gravity="center_vertical"
-        android:maxLines="1"
-        android:ellipsize="end"
-        style="@style/PageTitle" />
-
-</RelativeLayout>

res/layout/intro_restore_activity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+                   2017-2022 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.
@@ -15,62 +15,29 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     android:id="@+id/setup_wizard_layout"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
 
-        <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true">
+        <View android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/content_margin_left"
-                android:paddingEnd="@dimen/content_margin_left"
-                style="@style/PageContent">
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="true" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/PageSummaryText"
-                    android:textSize="16sp"
-                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:text="@string/intro_restore_subtitle" />
-
-                <Button
-                    android:id="@+id/intro_restore_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:gravity="center"
-                    android:textSize="16sp"
-                    android:textAllCaps="true"
-                    android:textColor="@color/white"
-                    android:background="@color/accent"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:text="@string/intro_restore_button"/>
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-</LinearLayout>
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/location_settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
-     Copyright (C) 2017-2020 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.
@@ -15,82 +15,98 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
 
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-        <ScrollView android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:fillViewport="true">
-
-            <LinearLayout
-                android:orientation="vertical"
+            <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                style="@style/PageContent">
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    style="@style/PageSummaryText" />
+                android:fillViewport="true">
 
                 <LinearLayout
-                    android:id="@+id/location"
-                    android:orientation="horizontal"
+                    android:orientation="vertical"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/location_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
+                    android:layout_height="match_parent">
 
-
-                    <CheckBox
-                        android:id="@+id/location_checkbox"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/location"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false" />
+                        android:paddingLeft="@dimen/location_margin_left"
+                        android:paddingRight="@dimen/content_margin_right"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true">
 
-                    <TextView
-                        android:id="@+id/location_summary"
-                        android:layout_width="0px"
+
+                        <CheckBox
+                            android:id="@+id/location_checkbox"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:duplicateParentState="true"
+                            android:clickable="false"
+                            style="@style/SudCheckBox.Multiline" />
+
+                        <TextView
+                            android:id="@+id/location_summary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/location_access_summary"
+                            style="@style/SudCheckBox.Multiline" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/location_agps"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        android:gravity="top"
-                        android:layout_marginLeft="@dimen/location_text_margin_left"
-                        android:layout_marginRight="@dimen/location_text_margin_right"
-                        android:paddingBottom="@dimen/content_margin_bottom"
-                        android:text="@string/location_access_summary"
-                        android:maxLines="5" />
+                        android:paddingLeft="@dimen/location_margin_left"
+                        android:paddingRight="@dimen/content_margin_right"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true">
+
+                        <CheckBox
+                            android:id="@+id/location_agps_checkbox"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:duplicateParentState="true"
+                            android:clickable="false"
+                            android:checked="true"
+                            style="@style/SudCheckBox.Multiline" />
+
+                        <TextView
+                            android:id="@+id/location_agps_summary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/location_agps_access_summary"
+                            style="@style/SudCheckBox.Multiline" />
+                    </LinearLayout>
 
                 </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
 
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/mobile_data_settings.xml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2013 The CyanogenMod Project
-     Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
-
-    <include layout="@layout/header_condensed" />
-
-    <ProgressBar
-        android:id="@+id/progress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:indeterminateOnly="true"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:visibility="gone"/>
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <ScrollView android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:fillViewport="true">
-
-            <LinearLayout
-                android:id="@+id/page_view"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/PageContent">
-
-                <TextView
-                    android:id="@+id/mobile_data_summary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/PageSummaryText"
-                    android:textSize="15sp"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:paddingBottom="@dimen/summary_margin_bottom"
-                    android:text="@string/enable_mobile_data_summary" />
-
-                <include layout="@layout/divider" />
-
-                <LinearLayout
-                    android:id="@+id/data"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:gravity="center_vertical"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/data_switch_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
-
-                    <ImageView
-                        android:id="@+id/signal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:src="@drawable/ic_signal_0" />
-
-                    <TextView
-                        android:id="@+id/enable_data_title"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="14sp"
-                        android:layout_marginLeft="@dimen/carrier_text_margin_left"
-                        android:text="@string/setup_mobile_data_no_service"
-                        android:maxLines="4" />
-
-                    <Switch
-                        android:id="@+id/data_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:gravity="center_vertical"
-                        android:duplicateParentState="true"
-                        android:clickable="false"
-                        android:textOff="@string/no"
-                        android:textOn="@string/yes"/>
-                </LinearLayout>
-
-                <include layout="@layout/divider" />
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>

res/layout/navigation_layout.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 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.
+     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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <Button
+        android:id="@+id/navbar_skip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:text="@string/skip"
+        android:visibility="gone"
+        style="@style/SudGlifButton.Secondary" />
+
+    <Button
+        android:id="@+id/navbar_next"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:text="@string/next"
+        style="@style/SudGlifButton.Primary" />
+
+</RelativeLayout>

res/layout/setup_biometric.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod 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.
+     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.
+-->
+<com.google.android.setupdesign.GlifLayout
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     android:id="@+id/setup_wizard_layout"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/setup_biometric_summary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/SudItemContainer.Verbose"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginBottom="24dp"
+                        android:paddingLeft="@dimen/content_margin_left"
+                        android:paddingRight="@dimen/location_text_margin_right"
+                        android:drawableStart="@drawable/ic_check_mark"
+                        android:drawablePadding="24dp"
+                        android:gravity="center_vertical"
+                        android:textSize="16sp"
+                        android:textStyle="bold"
+                        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"
+                        android:paddingLeft="@dimen/content_margin_left"
+                        android:paddingRight="@dimen/location_text_margin_right"
+                        android:drawableStart="@drawable/ic_check_mark"
+                        android:drawablePadding="24dp"
+                        android:gravity="center_vertical"
+                        android:textSize="16sp"
+                        android:textStyle="bold"/>
+
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="true" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/setup_datetime_page.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+                   2017-2022 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.
@@ -15,107 +15,104 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <ScrollView android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:fillViewport="true">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/PageContent">
-
-                <TextView
-                    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/date_time_summary" />
-
-                <Spinner
-                    android:id="@+id/timezone_list"
-                    android:layout_width="290dp"
-                    android:layout_height="wrap_content"
-                    android:saveEnabled="false"/>
-
-                <TwoLineListItem
-                    android:id="@+id/date_item"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:mode="twoLine"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        android:id="@+id/date_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setup_current_date"
-                        style="@style/SpinnerItem" />
-
-                    <TextView
-                        android:id="@+id/date_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/date_title"
-                        android:layout_alignStart="@id/date_title"
-                        android:fontFamily="sans-serif-medium"
-                        style="@style/SpinnerItem" />
-                </TwoLineListItem>
-
-                <TwoLineListItem
-                    android:id="@+id/time_item"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="?android:attr/listPreferredItemHeight"
-                    android:mode="twoLine"
-                    android:clickable="true"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:gravity="center_vertical">
-
-                    <TextView
-                        android:id="@+id/time_title"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="@string/setup_current_time"
-                        style="@style/SpinnerItem" />
-
-                    <TextView
-                        android:id="@+id/time_text"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/time_title"
-                        android:layout_alignStart="@id/time_title"
-                        android:fontFamily="sans-serif-medium"
-                        style="@style/SpinnerItem" />
-                </TwoLineListItem>
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
 
-</LinearLayout>
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Spinner
+                        android:id="@+id/timezone_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="24dp"
+                        android:saveEnabled="false"/>
+
+                    <TwoLineListItem
+                        android:id="@+id/date_item"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="?android:attr/listPreferredItemHeight"
+                        android:mode="twoLine"
+                        android:clickable="true"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/date_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/setup_current_date"
+                            style="@style/SpinnerItem" />
+
+                        <TextView
+                            android:id="@+id/date_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/date_title"
+                            android:layout_alignStart="@id/date_title"
+                            android:fontFamily="sans-serif-medium"
+                            style="@style/SpinnerItem" />
+                    </TwoLineListItem>
+
+                    <TwoLineListItem
+                        android:id="@+id/time_item"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="?android:attr/listPreferredItemHeight"
+                        android:mode="twoLine"
+                        android:clickable="true"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:gravity="center_vertical">
+
+                        <TextView
+                            android:id="@+id/time_title"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:text="@string/setup_current_time"
+                            style="@style/SpinnerItem" />
+
+                        <TextView
+                            android:id="@+id/time_text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_below="@id/time_title"
+                            android:layout_alignStart="@id/time_title"
+                            android:fontFamily="sans-serif-medium"
+                            style="@style/SpinnerItem" />
+                    </TwoLineListItem>
+
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/setup_device_specific.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 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.
+     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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" />

res/layout/setup_fingerprint.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primary">
-
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@style/PageContent">
-
-                <TextView
-                    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" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="24dp"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:drawableStart="@drawable/ic_check_mark"
-                    android:drawablePadding="24dp"
-                    android:gravity="center_vertical"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:text="@string/fingerprint_setup_backup_lock_method"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="24dp"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:drawableStart="@drawable/ic_check_mark"
-                    android:drawablePadding="24dp"
-                    android:gravity="center_vertical"
-                    android:textSize="16sp"
-                    android:textStyle="bold"
-                    android:text="@string/fingerprint_setup_add_fingerprint"/>
-
-                <TextView
-                    android:id="@+id/setup_fingerprint"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    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"/>
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>

res/layout/setup_lineage_settings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017,2019 The LineageOS Project
+                   2017-2022 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.
@@ -15,122 +15,102 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <ScrollView android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:fillViewport="true">
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <!-- The caption about privacy policy -->
-                <TextView
-                    android:id="@+id/privacy_policy"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="15sp"
-                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    style="@style/PageSummaryText"
-                    android:text="@string/services_explanation"
-                    android:clickable="true"/>
-
-                <!-- Whether or not to enable metrics -->
-                <LinearLayout
-                    android:id="@+id/metrics"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/location_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
-
-
-                    <CheckBox
-                        android:id="@+id/enable_metrics_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false"/>
-
-                    <TextView
-                        android:id="@+id/enable_metrics_summary"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        android:gravity="top"
-                        android:layout_marginLeft="@dimen/location_text_margin_left"
-                        android:layout_marginRight="@dimen/location_text_margin_right"
-                        android:paddingBottom="@dimen/content_margin_bottom"
-                        android:text="@string/services_metrics_label"/>
-
-                </LinearLayout>
-
-                <!-- Checkbox for using on-screen nav keys -->
-                <LinearLayout
-                    android:id="@+id/nav_keys"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/location_margin_left"
-                    android:paddingRight="@dimen/content_margin_right"
-                    android:background="?android:attr/selectableItemBackground"
-                    android:clickable="true">
-
-                    <CheckBox
-                        android:id="@+id/nav_keys_checkbox"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="5dp"
-                        android:duplicateParentState="true"
-                        android:clickable="false" />
-
-
-                    <TextView
-                        android:id="@+id/nav_keys_summary"
-                        android:layout_width="0px"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:textSize="15sp"
-                        android:lineSpacingExtra="@dimen/setup_line_spacing"
-                        android:gravity="top"
-                        android:layout_marginLeft="@dimen/location_text_margin_left"
-                        android:layout_marginRight="@dimen/location_text_margin_right"
-                        android:paddingBottom="@dimen/content_margin_bottom"
-                        android:text="@string/services_os_nav_keys_label"/>
-
-                </LinearLayout>
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame"
+        android:layout_marginTop="@dimen/base_margin_top">
+
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <!-- Whether or not to enable metrics -->
+                    <LinearLayout
+                        android:id="@+id/metrics"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/location_margin_left"
+                        android:paddingRight="@dimen/content_margin_right"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true">
+
+
+                        <CheckBox
+                            android:id="@+id/enable_metrics_checkbox"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:duplicateParentState="true"
+                            android:clickable="false"
+                            style="@style/SudCheckBox.Multiline" />
+
+                        <TextView
+                            android:id="@+id/enable_metrics_summary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/services_metrics_label"
+                            style="@style/SudCheckBox.Multiline" />
+
+                    </LinearLayout>
+
+                    <!-- Checkbox for using on-screen nav keys -->
+                    <LinearLayout
+                        android:id="@+id/nav_keys"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/location_margin_left"
+                        android:paddingRight="@dimen/content_margin_right"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true">
+
+                        <CheckBox
+                            android:id="@+id/nav_keys_checkbox"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="top"
+                            android:duplicateParentState="true"
+                            android:clickable="false"
+                            style="@style/SudCheckBox.Multiline" />
+
+                        <TextView
+                            android:id="@+id/nav_keys_summary"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/services_os_nav_keys_label"
+                            style="@style/SudCheckBox.Multiline" />
+
+                    </LinearLayout>
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
 
-</LinearLayout>

res/layout/setup_loading_page.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 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.
@@ -15,33 +15,39 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+     xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:app="http://schemas.android.com/apk/res-auto"
+     android:id="@+id/setup_wizard_layout"
+     android:layout_width="match_parent"
+     android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
+     <LinearLayout
+          android:orientation="vertical"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent">
 
-    <ProgressBar
-        android:id="@+id/progressBar1"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:indeterminateOnly="true"
-        android:layout_width="match_parent"
-        android:layout_height="8dp"
-        android:paddingStart="0dp"
-        android:paddingEnd="0dp" />
+          <ProgressBar
+               android:id="@+id/progressBar1"
+               style="?android:attr/progressBarStyleHorizontal"
+               android:indeterminateOnly="true"
+               android:layout_width="match_parent"
+               android:layout_height="8dp"
+               android:paddingStart="0dp"
+               android:paddingEnd="0dp" />
 
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1"
-                 style="@style/PageContent"/>
+          <FrameLayout
+               android:id="@+id/page"
+               android:layout_width="match_parent"
+               android:layout_height="0dp"
+               android:layout_weight="1"
+               style="@style/SudContentFrame"/>
 
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+          <com.google.android.setupdesign.view.NavigationBar
+               android:id="@+id/navigation_bar"
+               style="@style/SudNavBarTheme"
+               android:layout_width="match_parent"
+               android:layout_height="@dimen/sud_navbar_height" />
 
-</LinearLayout>
+     </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/setup_locale.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013 The CyanogenMod Project
-     Copyright (C) 2017 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.
@@ -15,37 +15,41 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/primary">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
-
-    <RelativeLayout android:layout_width="match_parent"
-                    android:layout_height="0dp"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/content_margin_left">
-
-        <org.lineageos.setupwizard.widget.LocalePicker
-            android:id="@+id/locale_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"/>
-
-    </RelativeLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        style="@style/SudContentFrame">
 
-</LinearLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <org.lineageos.setupwizard.widget.LocalePicker
+                android:id="@+id/locale_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                style="@style/LocaleWidget.Material.LocalePicker" />
+
+        </RelativeLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/setup_lockscreen.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+                   2017-2022 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.
@@ -15,63 +15,29 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/primary">
+    android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
 
-        <ScrollView android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:fillViewport="true">
+        <View android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
 
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/content_margin_left"
-                android:paddingEnd="@dimen/content_margin_left"
-                style="@style/PageContent">
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:showSkipButton="true" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/PageSummaryText"
-                    android:textSize="16sp"
-                    android:layout_marginBottom="@dimen/summary_margin_bottom"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:text="@string/lockscreen_setup_summary" />
-
-                <Button
-                    android:id="@+id/setup_lockscreen"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingLeft="@dimen/content_margin_left"
-                    android:paddingRight="@dimen/location_text_margin_right"
-                    android:gravity="center"
-                    android:textSize="16sp"
-                    android:textAllCaps="true"
-                    android:textColor="@color/white"
-                    android:background="@color/accent"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    android:text="@string/lockscreen_setup_screen_lock_setup"/>
-
-            </LinearLayout>
-        </ScrollView>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
-
-</LinearLayout>
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/setup_navigation.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame"
+        android:layout_marginTop="@dimen/base_margin_top">
+
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/navigation_illustration"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:lottie_rawRes="@raw/lottie_system_nav_fully_gestural"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="true" />
+
+                    <RadioGroup
+                        android:id="@+id/navigation_radio_group"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <RadioButton
+                            android:id="@+id/radio_gesture"
+                            android:text="@string/gesture_navigation"
+                            android:checked="true"
+                            style="@style/SudRadioButton" />
+
+                        <RadioButton
+                            android:id="@+id/radio_two_button"
+                            android:text="@string/two_button_navigation"
+                            style="@style/SudRadioButton" />
+
+                        <RadioButton
+                            android:id="@+id/radio_sw_keys"
+                            android:text="@string/navbar_navigation"
+                            style="@style/SudRadioButton" />
+
+                    </RadioGroup>
+
+                    <CheckBox
+                        android:id="@+id/hide_navigation_hint"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/hide_gesture_hint"
+                        android:layout_marginTop="0dp"
+                        android:layout_marginBottom="6dp"
+                        android:layout_marginLeft="-6dp"
+                        android:paddingLeft="18dp"
+                        style="@style/SudCheckBox" />
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
+

res/layout/sim_missing_page.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2015 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+                   2017-2022 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.
@@ -15,51 +15,37 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:background="@color/primary">
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
-    <include layout="@layout/header_condensed" />
-
-    <FrameLayout android:id="@+id/page"
-                 android:layout_width="match_parent"
-                 android:layout_height="0dp"
-                 android:layout_weight="1">
-
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            style="@style/PageContent">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/sim_missing"
-                style="@style/PageSummaryText"
-                android:textSize="15sp"
-                android:layout_marginBottom="@dimen/summary_margin_bottom"
-                android:paddingLeft="@dimen/content_margin_left"
-                android:paddingRight="@dimen/content_margin_right"
-                android:text="@string/sim_missing_summary" />
-
-            <ImageView
-                android:id="@+id/sim_slot_image"
-                android:layout_width="match_parent"
-                android:layout_height="0px"
-                android:layout_weight="1"
-                android:scaleType="fitEnd"
-                android:src="@drawable/sim"/>
-
-        </LinearLayout>
-    </FrameLayout>
-
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
 
-</LinearLayout>
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+            </LinearLayout>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/update_recovery_page.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2015 The CyanogenMod Project
+                   2017-2022 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.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        style="@style/SudContentFrame">
+
+        <FrameLayout
+            android:id="@+id/page"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <ScrollView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:orientation="vertical"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <LinearLayout
+                        android:id="@+id/update_recovery_checkbox_view"
+                        android:orientation="horizontal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingLeft="@dimen/location_margin_left"
+                        android:paddingRight="@dimen/content_margin_right"
+                        android:background="?android:attr/selectableItemBackground"
+                        android:clickable="true">
+
+                        <CheckBox
+                            android:id="@+id/update_recovery_checkbox"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:duplicateParentState="true"
+                            android:clickable="false"
+                            style="@style/SudCheckBox.Multiline" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/update_recovery_setting"
+                            android:textStyle="bold"
+                            style="@style/SudCheckBox.Multiline" />
+
+                    </LinearLayout>
+                </LinearLayout>
+            </ScrollView>
+        </FrameLayout>
+
+        <org.lineageos.setupwizard.NavigationLayout
+            android:id="@+id/navigation_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/layout/welcome_activity.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+     Copyright (C) 2017-2022 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.
@@ -15,30 +15,117 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<LinearLayout
+<com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/root"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/primary">
+    android:layout_height="match_parent">
 
-    <ImageView
-        android:id="@+id/brand_logo"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="0px"
-        android:layout_weight="1"
-        android:src="@drawable/logo"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
-        android:gravity="center"
-        android:padding="@dimen/content_margin_left"/>
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <com.google.android.setupdesign.view.NavigationBar
-        android:id="@+id/navigation_bar"
-        style="@style/SudNavBarTheme"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/sud_navbar_height" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:gravity="center_vertical">
 
-</LinearLayout>
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="2"/>
+
+            <ImageView
+                android:id="@+id/brand_logo"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:adjustViewBounds="true"
+                android:scaleType="centerCrop"
+                android:src="@drawable/logo" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"/>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:orientation="vertical">
+
+            <LinearLayout
+                style="@style/SudContentFrame"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:orientation="vertical"
+                android:paddingStart="@dimen/welcome_content_container_padding_start"
+                android:paddingEnd="@dimen/welcome_content_container_padding_end"
+                android:paddingBottom="@dimen/welcome_content_container_padding_bottom">
+
+                <TextView
+                    style="@style/WelcomeTitle"
+                    android:id="@+id/welcome_title"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:hyphenationFrequency="none"
+                    android:paddingBottom="@dimen/welcome_content_container_padding_bottom"/>
+
+                <LinearLayout
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:animateLayoutChanges="true"
+                    android:focusableInTouchMode="true"
+                    android:importantForAccessibility="no"
+                    android:orientation="vertical">
+
+                    <Button
+                        android:id="@+id/launch_accessibility"
+                        style="@style/SudGlifButton.Secondary"
+                        android:layout_width="fill_parent"
+                        android:layout_height="fill_parent"
+                        android:layout_gravity="center_vertical"
+                        android:drawableStart="@drawable/ic_eye"
+                        android:gravity="start|center"
+                        android:drawablePadding="@dimen/welcome_content_container_padding_end"
+                        android:textSize="@dimen/welcome_accessibility_text_size"
+                        android:textColor="?android:textColorPrimary"
+                        android:text="@string/accessibility_settings" />
+                </LinearLayout>
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            style="@style/SudGlifButtonBar.Stackable"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom">
+
+            <Button
+                android:id="@+id/emerg_dialer"
+                style="@style/SudGlifButton.Secondary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/emergency_call" />
+
+            <Space
+                android:layout_width="0.0dip"
+                android:layout_height="0.0dip"
+                android:layout_weight="1.0" />
+
+            <Button
+                android:id="@id/start"
+                style="@style/SudGlifButton.Primary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/start" />
+        </LinearLayout>
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>

res/mipmap-anydpi/ic_launcher.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

res/raw-television/lineage_wizard_script.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright (C) 2016 The CyanogenMod Project
+     Copyright (C) 2017 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.
+-->
+
+<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
+    wizard:firstAction="bluetooth_setup">
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BLUETOOTH_SETUP;end" id="bluetooth_setup">
+        <result wizard:action="welcome" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+        <result wizard:action="locale" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
+        <result wizard:action="network_setup" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
+        <result wizard:action="device_specific" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific">
+        <result wizard:action="recovery_update" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
+        <result wizard:action="lineage_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
+        <result wizard:action="finish" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
+        <result wizard:action="exit" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
+
+</WizardScript>

res/raw/lineage_wizard_script.xml

@@ -2,7 +2,7 @@
 
 <!--
      Copyright (C) 2016 The CyanogenMod Project
-     Copyright (C) 2017 The LineageOS Project
+     Copyright (C) 2017-2022 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.
@@ -27,49 +27,52 @@
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
         <result wizard:action="locale" />
     </WizardAction>
+
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCALE;end" id="locale">
+        <result wizard:action="sim_missing" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
+        <result wizard:action="network_setup" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_NETWORK_SETUP;end" id="network_setup">
         <result wizard:action="datetime" />
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_DATETIME;end" id="datetime">
-        <result wizard:action="wifi_setup" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WIFI_SETUP;end" id="wifi_setup">
-        <result wizard:resultCode="1" wizard:action="sim_missing" wizard:name="no_sim" />
-        <result wizard:action="choose_data_sim" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SIM_MISSING;end" id="sim_missing">
-        <result wizard:resultCode="1" wizard:action="location_settings" wizard:name="skip_sim" />
-        <result wizard:action="choose_data_sim" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_CHOOSE_DATA_SIM;end" id="choose_data_sim">
-        <result wizard:action="enable_mobile_data" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_ENABLE_MOBILE_DATA;end" id="enable_mobile_data">
         <result wizard:action="location_settings" />
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+        <result wizard:action="device_specific" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="device_specific">
+        <result wizard:action="recovery_update" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
         <result wizard:action="lineage_settings" />
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
-        <result wizard:action="fingerprint_settings" />
-    </WizardAction>
-
-    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_FINGERPRINT_SETTINGS;end" id="fingerprint_settings">
         <result wizard:action="lockscreen_settings" />
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
+        <result wizard:action="biometric_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
         <result wizard:action="restore" />
     </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+        <result wizard:action="navigation_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
         <result wizard:action="finish" />
     </WizardAction>
 

res/raw/lineage_wizard_script_managed_profile.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+     Copyright (C) 2016 The CyanogenMod Project
+     Copyright (C) 2021 The Calyx Institute
+
+    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.
+-->
+
+<WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
+              wizard:firstAction="welcome">
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+        <result wizard:action="location_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+        <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">
+        <result wizard:action="exit" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.EXIT;end" id="exit" />
+
+</WizardScript>

res/raw/lineage_wizard_script_user.xml

@@ -17,7 +17,31 @@
 -->
 
 <WizardScript xmlns:wizard="http://schemas.android.com/apk/res/com.google.android.setupwizard"
-              wizard:firstAction="finish">
+              wizard:firstAction="welcome">
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_WELCOME;end" id="welcome">
+        <result wizard:action="location_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCATION_SETTINGS;end" id="location_settings">
+        <result wizard:action="lockscreen_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_LOCKSCREEN_SETTINGS;end" id="lockscreen_settings">
+        <result wizard:action="biometric_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_BIOMETRIC_SETTINGS;end" id="biometric_settings">
+        <result wizard:action="restore" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RESTORE_BACKUP;end" id="restore">
+        <result wizard:action="navigation_settings" />
+    </WizardAction>
+
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+        <result wizard:action="finish" />
+    </WizardAction>
 
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="finish">
         <result wizard:action="exit" />

res/raw/wizard_script.xml

@@ -2,7 +2,7 @@
 
 <!--
     Copyright (c) 2014 Google Inc.
-    Copyright (C) 2017,2019 The LineageOS Project
+    Copyright (C) 2017,2019-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.
@@ -31,8 +31,21 @@
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.WELCOME;end" id="welcome">
         <result wizard:action="check_user_unlock_qr" wizard:name="start_qr_provision" wizard:resultCode="101" />
         <result wizard:action="check_user_unlock_dpm_user_complete" wizard:name="dpm_user_complete" wizard:resultCode="111" />
+        <result wizard:action="check_user_unlock_dpm_user_complete" wizard:name="dpm_profile_complete" wizard:resultCode="112" />
+        <result wizard:action="check_user_unlock_work_setup_interrupted_qr_scan" wizard:name="check_user_unlock_work_setup_interrupted_qr_scan" wizard:resultCode="114" />
+        <result wizard:action="check_user_unlock_work_setup_interrupted_consumer_flow" wizard:name="check_user_unlock_work_setup_interrupted_consumer_flow" wizard:resultCode="115" />
         <result wizard:action="check_user_unlock" />
     </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_work_setup_interrupted_qr_scan" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.WORK_SETUP_INTERRUPTED;end" id="work_setup_interrupted_qr_scan">
+        <result wizard:action="check_user_unlock_qr" wizard:name="continue_start_qr_scan" wizard:resultCode="1" />
+        <result wizard:action="factory_reset" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_work_setup_interrupted_consumer_flow" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.WORK_SETUP_INTERRUPTED;end" id="work_setup_interrupted_consumer_flow">
+        <result wizard:action="check_user_unlock" wizard:name="continue_start_consumer_flow" wizard:resultCode="1" />
+        <result wizard:action="factory_reset" />
+    </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock_qr">
         <result wizard:action="qr_provision_flow" />
     </WizardAction>
@@ -40,12 +53,22 @@
         <result wizard:action="oem_post_setup" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SLOTS_SELECTION;end" id="slots_selection">
+        <result wizard:action="sim_missing" wizard:name="skip" wizard:resultCode="1" />
+        <result wizard:action="carrier_setup" />
+    </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_MISSING;end" id="sim_missing">
         <result wizard:action="esim_intro" wizard:name="esim" wizard:resultCode="101" />
+        <result wizard:action="carrier_setup" wizard:name="esim_only" wizard:resultCode="102" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_READY;end" id="sim_ready">
         <result wizard:action="carrier_setup" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.ESIM_INTRO;end" id="esim_intro" />
-    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CARRIER_SETUP;end" id="carrier_setup" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CARRIER_SETUP;end" id="carrier_setup">
+        <result wizard:action="sim_setup" wizard:name="all_subscriptions_completed" wizard:resultCode="98765" />
+        <result wizard:action="carrier_setup" />
+    </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.SIM_SETUP;end" id="sim_setup" />
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.DEVICE_OWNER_WARNING;end" id="device_owner_warning">
         <result wizard:action="check_frp" wizard:name="skip" wizard:resultCode="1" />
@@ -57,34 +80,53 @@
     </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_zero_touch_flow" id="zero_touch">
         <result wizard:action="post_dpm_user_flow" wizard:name="dpm_user_complete" wizard:resultCode="111" />
-    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.FLOW_CHOICE;end" id="flow_choice">
-        <result wizard:action="setup_as_new_flow" wizard:name="skip" wizard:resultCode="1" />
-        <result wizard:action="exit" wizard:name="demo_mode_flow" wizard:resultCode="101" />
-        <result wizard:action="unified_restore_flow" wizard:name="unified_restore_flow" wizard:resultCode="102" />
-    </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_restore_flow" id="restore_flow">
-        <result wizard:action="oem_post_setup" />
+        <result wizard:action="add_personal_account_after_work_profile" wizard:name="add_personal_account_after_work_profile" wizard:resultCode="120" />
+        <result wizard:action="setup_as_new_flow" wizard:name="financed_device_provisioning_complete" wizard:resultCode="121" />
+        <result wizard:action="work_profile_setup" wizard:name="work_profile_setup" wizard:resultCode="122" />
+        <result wizard:action="post_dpm_user_flow" wizard:name="device_owner_setup" wizard:resultCode="123" />
+        <result wizard:action="setup_as_new_flow" wizard:name="gmscore_zero_touch" wizard:resultCode="116" />
     </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_unified_restore_flow" id="unified_restore_flow">
         <result wizard:action="oem_post_setup" />
     </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_setup_as_new_flow" id="setup_as_new_flow">
-        <result wizard:action="oem_post_setup" />
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_post_dpm_provision_finalization_flow" id="work_profile_setup">
+        <result wizard:action="transition_to_personal_profile_setup" />
     </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_no_network_flow" id="no_network_flow">
         <result wizard:action="oem_post_setup" />
     </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.TRANSITION_TO_PERSONAL_PROFILE_SETUP;end" id="transition_to_personal_profile_setup">
+        <result wizard:action="add_personal_account_after_work_profile" />
+    </WizardAction>
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_account_flow" id="add_personal_account_after_work_profile">
+        <result wizard:action="oem_post_setup" />
+    </WizardAction>
+    <WizardAction wizard:flow="SetupAsNewFlow" wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_account_flow" id="setup_as_new_flow">
+        <result wizard:action="oem_post_setup" />
+    </WizardAction>
     <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_post_dpm_user_flow" id="post_dpm_user_flow">
         <result wizard:action="oem_post_setup" />
     </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">
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.DEVICE_SPECIFIC;end" id="oem_post_setup">
+        <result wizard:action="recovery_update" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_RECOVERY_UPDATE;end" id="recovery_update">
+        <result wizard:action="lineage_settings" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETTINGS;end" id="lineage_settings">
+        <result wizard:action="navigation_settings" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.NAVIGATION_SETTINGS;end" id="navigation_settings">
+        <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">
         <result wizard:action="exit" />
     </WizardAction>
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_post_dpm_provision_finalization_flow" id="enterprise_finalization_flow" />
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.KID_POST_SETUP;end" id="kid_post_setup" />
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.EXIT;end" id="exit" />
 </WizardScript>

res/raw/wizard_script_user.xml

@@ -2,7 +2,7 @@
 
 <!--
     Copyright (c) 2014 Google Inc.
-    Copyright (C) 2017,2019 The LineageOS Project
+    Copyright (C) 2017,2019-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.
@@ -35,36 +35,48 @@
         <result wizard:action="oem_post_setup" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CHECK_USER_UNLOCK;end" id="check_user_unlock" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.COMPLETE_IN_FLIGHT_UPDATES;end" id="complete_in_flight_updates" />
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.NETWORK_SETTINGS;end" id="network_settings">
         <result wizard:action="wifi_settings" wizard:name="see_all_wifi" wizard:resultCode="102" />
-        <result wizard:action="network_check" wizard:name="skip" wizard:resultCode="1" />
-        <result wizard:action="captive_portal" />
+        <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
+        <result wizard:action="consolidate_captive_portal" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.WIFI_SETTINGS;end" id="wifi_settings">
-        <result wizard:action="network_check" wizard:name="skip" wizard:resultCode="1" />
-    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CAPTIVE_PORTAL;end" id="captive_portal" />
-    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_CHECKIN;end" id="gms_checkin" />
-    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.EARLY_UPDATE;end" id="early_update" />
-    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.NETWORK_CHECK;end" id="network_check">
         <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
     </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_rollback_auth_early_update_flow" id="rollback_auth_early_update" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.android.setupwizard.CONSOLIDATE_CAPTIVE_PORTAL;end" id="consolidate_captive_portal">
+        <result wizard:action="network_unavailable" wizard:name="timeout" wizard:resultCode="101" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.PRE_CHECKIN_AND_UPDATE;end" id="pre_checkin_and_update">
+        <result wizard:action="network_timeout" wizard:name="timeout" wizard:resultCode="101" />
+        <result wizard:action="post_checkin_and_update" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.NETWORK_TIMEOUT;end" id="network_timeout" />
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.POST_CHECKIN_AND_UPDATE;end" id="post_checkin_and_update">
+        <result wizard:action="network_check" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.NETWORK_CHECK;end" id="network_check">
+        <result wizard:action="network_unavailable" wizard:name="no_connection" wizard:resultCode="1" />
+        <result wizard:action="load_account_intent" />
+    </WizardAction>
+    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.NETWORK_TIMEOUT;end" id="network_unavailable" />
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.LOAD_ADD_ACCOUNT_INTENT;end" id="load_account_intent" />
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_SETUP;end" id="account_setup">
         <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
+        <result wizard:action="rollback_auth_early_update" wizard:name="unintentional_cancel" wizard:resultCode="102" />
         <result wizard:action="oem_post_setup" wizard:name="dpm_user_complete" wizard:resultCode="111" />
+        <result wizard:action="gms_account_checkin" />
+    </WizardAction>
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_rollback_auth_early_update_flow" id="rollback_auth_early_update">
+        <result wizard:action="load_account_intent" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.GMS_ACCOUNT_CHECKIN;end" id="gms_account_checkin">
-        <result wizard:action="mfm_check" wizard:name="skip" wizard:resultCode="1" />
-    </WizardAction>
-    <WizardAction wizard:uri="intent:#Intent;action=com.google.android.setupwizard.ACCOUNT_CHECK;end" id="mfm_check">
         <result wizard:action="no_account_flow" wizard:name="skip" wizard:resultCode="1" />
     </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow" id="account_flow">
+    <WizardAction wizard:flow="UserAccountFlow" wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow" id="account_flow">
         <result wizard:action="oem_post_setup" />
     </WizardAction>
-    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_no_account_flow" id="no_account_flow">
+    <WizardAction wizard:script="android.resource://com.google.android.setupwizard/xml/wizard_script_user_account_flow" id="no_account_flow">
         <result wizard:action="oem_post_setup" />
     </WizardAction>
     <WizardAction wizard:uri="intent:#Intent;action=org.lineageos.setupwizard.LINEAGE_SETUP_COMPLETE;end" id="oem_post_setup" />

res/values-af/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -39,9 +39,6 @@
     <string name="choose_data_sim_summary" product="tablet">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou tablet.</string>
     <string name="choose_data_sim_summary" product="default">Watter SIM wil jy gebruik vir data? Die gekose SIM kan netwerk koste aangaan, dit sal gebruik word met die opstel van jou foon.</string>
     <string name="date_time_summary">Stel jou tydsone en pas huidige datum en tyd toe, indien nodig</string>
-    <string name="backup_data_summary"><b>Rugsteun</b> program data, Wi-Fi wagwoorde en ander instellings na Google-bedieners</string>
-    <string name="other_services_summary">Hierdie dienste word deur Google verskaf en jy kan dit aktiveer of deaktiveer op enige tyd. Data sal in ooreenstemming met Google se <xliff:g id="name" example="Privacy Policy">%s</xliff:g> gebruik word.</string>
-    <string name="location_services_summary">Ligging dienste laat stelsel en ander 3rde party programme toe om data te gebruik soos jou benaderde ligging. Bv \'n program kan jou benaderde ligging gebruik om nabygeleë koffiewinkels op te spoor.</string>
     <string name="location_access_summary"><b>Laat programme toe wat jou toestemming gevra het</b> om jou ligging inligting te gebruik. Dit kan jou huidige ligging en plekke asook liggings en plekke uit die verlede insluit.</string>
     <string name="setup_mobile_data">Skakel mobiele data aan</string>
     <string name="setup_mobile_data_no_service">Geen diens</string>
@@ -51,21 +48,14 @@
     <string name="yes">Ja</string>
     <string name="emergency_call">Noodoproep</string>
     <string name="setup_services">LineageOS kenmerke</string>
-    <string name="services_explanation" product="tablet">Hierdie dienste werk vir jou om die vermoëns van jou tablet uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
-    <string name="services_explanation" product="default">Hierdie dienste werk vir jou om die vermoëns van jou foon uit te brei. Data sal in ooreenkomstig met LineageOS se <xliff:g id="name" example="Privaatheidspolitiek">%s</xliff:g> gebruik word.</string>
-    <string name="services_privacy_policy">Privaatheid beleid</string>
     <string name="services_os_nav_keys_label"><b>Gebruik skerm navigasie sleutels</b> in plaas van hardeware sleutels.</string>
-    <string name="setup_unlock">Ontsluit</string>
-    <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>

res/values-ar/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">ثانية واحدة</string>
     <string name="setup_complete">الإعداد تم</string>
     <string name="setup_welcome">مرحبا</string>
+    <string name="setup_welcome_message">مرحبا بك في <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">اللغة</string>
     <string name="setup_wifi">تحديد الواي فاي</string>
     <string name="setup_sim_missing">شريحة SIM مفقودة</string>
@@ -39,9 +40,6 @@
     <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> لبيانات التطبيقات وكلمات مرور شبكات الواي فاي والإعدادات الأخرى على خوادم جوجل</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>
@@ -49,30 +47,45 @@
     <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="accessibility_settings">إعدادات إمكانية الوصول</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>
-    <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_pp_explanation">تعمل هذه الخدمات من أجلك لتوسيع قدرات جهازك. ستستخدم البيانات وفقا لسياسة الخصوصية <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">يمكنك قراءة سياسة الخصوصية على جهاز آخر بزيارة <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></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_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> بإرسال بيانات التشخيص والاستخدام تلقائياً إلى <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. لا يمكن استخدامها لتحديد هويتك وتقديم يد المساعدة للفرق التي تعمل على أشياء مثل عمر البطارية وأداء التطبيقات والميزات <xliff:g id="name" example="LineageOS">%3$s</xliff:g><xliff:g id="name" example="LineageOS">%3$s</xliff:g><xliff:g id="name" example="LineageOS">%3$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_title">حدد نوعاً احتياطياً لشاشة القفل</string>
-    <string name="settings_fingerprint_setup_details">كيف تريد إقفال الشاشة؟</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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_title" product="tablet">حماية جهازك اللوحي</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_button">استعادة من نسخة احتياطية</string>
+    <string name="update_recovery_title">تحديث وضع الاسترداد (recovery)</string>
+    <string name="update_recovery_description">تحديث Lineage Recovery عند أول تشغيل بعد كل تحديث.</string>
+    <string name="update_recovery_warning">سيُحدث وضع الاسترداد بمجرد الانتهاء من الإعداد. إذا كنت ترغب في الحفاظ على وضع الاسترداد الحالي، قم بتعطيل هذه الميزة.</string>
+    <string name="update_recovery_setting">تحديث Lineage Recovery إلى جانب نظام التشغيل</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">التنقل</string>
+    <string name="navigation_summary">اختر طريقة التنقل المفضلة</string>
+    <string name="gesture_navigation">التنقل بالإيماءات</string>
+    <string name="two_button_navigation">التنقل باستخدام زرّين</string>
+    <string name="navbar_navigation">التنقل باستخدام ثلاثة أزرار</string>
+    <string name="hide_gesture_hint">إخفاء تلميحات التنقل الإيمائي</string>
+    <string name="location_agps_access_summary">عندما يكون الموقع قيد التشغيل، <b>قم بتنزيل بيانات مساعدة الأقمار الصناعية من الإنترنت</b>، مما يمكن أن يحسن أداء بدء تشغيل GPS بشكل كبير.</string>
 </resources>

res/values-as/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -37,9 +37,6 @@
     <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">এপ্প ডাটা, Wi-Fi পাছৱৰ্ড আৰু অন্যান্য ছেটিংচ Google ছাৰ্ভাৰলৈ <b>বেক আপ কৰক</b></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>
@@ -48,18 +45,14 @@
     <string name="no">নহয়</string>
     <string name="yes">হয়</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="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>

res/values-ast-rES/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -19,59 +19,62 @@
     <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_welcome_message">Afáyate en <xliff:g id="name" example="LineageOS">%1$s</xliff:g></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="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="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="accessibility_settings">Configuración de l\'accesibilidá</string>
+    <string name="setup_services">Funciones de LineageOS</string>
+    <string name="services_pp_explanation">Estos servicios funcionen p\'aumentar les funciones del preséu. Los datos van usase d\'acuerdu cola política de privacidá de <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
+    <string name="services_find_privacy_policy">Pues lleer la política de privacidá n\'otru preséu pente la visita a <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></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 <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. 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">%3$s</xliff:g>.</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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="default">Proteición del teléfonu</string>
+    <string name="lockscreen_setup_title" product="tablet">Proteición de la tableta</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">Si tienes dalguna copia de seguranza de <xliff:g id="name" example="LineageOS">%s</xliff:g> pal preséu, pues restaurala equí.</string>
+    <string name="update_recovery_title">Anovar el recovery de Lineage</string>
+    <string name="update_recovery_description">Anueva\'l recovery de Lineage nel primer arrinque de cada anovamientu.</string>
+    <string name="update_recovery_warning">El recovery anuévase namás que fine la configuración. Si nun lu quies tocar, desactiva esta función.</string>
+    <string name="update_recovery_setting">Anovar el recovery xunto con LineageOS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navegación</string>
+    <string name="navigation_summary">Escueyi\'l métodu de navegación preferíu</string>
+    <string name="gesture_navigation">Navegación xestual</string>
+    <string name="two_button_navigation">Navegación con dos botones</string>
+    <string name="navbar_navigation">Navegación con trés botones</string>
+    <string name="hide_gesture_hint">Esconder l\'indicador de la navegación xestual</string>
+    <string name="location_agps_access_summary">Al activar la llocalización, <b>baxa los datos d\'asistencia satelitales d\'internet</b> que puen ameyorar muncho\'l rindimientu inicial del GPS</string>
 </resources>

res/values-az/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,55 +25,69 @@
     <string name="loading">Bir saniyə\u2026</string>
     <string name="setup_complete">Quraşdırma tamamlandı</string>
     <string name="setup_welcome">Xoş gəldiniz</string>
+    <string name="setup_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> xoş gəldiniz</string>
     <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>
-    <string name="setup_current_date">Hazırki tarix</string>
-    <string name="setup_current_time">Hazırki vaxt</string>
+    <string name="setup_current_date">Hazırkı tarix</string>
+    <string name="setup_current_time">Hazırkı 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="location_access_summary"><b>Yer məlumatlarınızı istəyən tətbiqlərə icazə verin.</b> Bu hazırkı 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="accessibility_settings">Əlçatımlılıq ayarları</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_privacy_policy">Gizlilik Siyasəti</string>
+    <string name="services_pp_explanation">Bu xidmətlər cihazınızın imkanlarını artırır. Datalar, <xliff:g id="name" example="LineageOS">%1$s</xliff:g>un gizlilik siyasətinə uyğun olaraq istifadə ediləcək.</string>
+    <string name="services_find_privacy_policy">Gizlilik siyasətini fərqli cihazda <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> ünvanını ziyarət edərək oxuya bilərsiniz</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"><xliff:g id="name" example="LineageOS">%2$s</xliff:g>-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əlumatlar, kimliyinizi müəyyənləşdirmək üçün istifadə edilmir və batareya ömrü, tətbiq performansı və yeni <xliff:g id="name" example="LineageOS">%3$s</xliff:g> xüsusiyyətləri kimi işlərlə məşğul olan komandalara kömək edir.</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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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_title" product="device">Cihazınızı qoruyun</string>
+    <string name="lockscreen_setup_title" product="tablet">Planşetinizi qoruyun</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">Son <xliff:g id="name" example="LineageOS">%s</xliff:g> cihazınızda 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>
+    <string name="update_recovery_title">Lineage Geri qaytarma Rejimini Güncəllə</string>
+    <string name="update_recovery_description">Hər güncəlləmədən sonrakı ilk açılışda Lineage Geri qaytarma rejimini güncəlləyir.</string>
+    <string name="update_recovery_warning">Quraşdırma bitən kimi Geri qaytarma rejimi güncəllənəcək. Sağlam qalmasını istəyirsinizsə, bu özəlliyi sıradan çıxardın.</string>
+    <string name="update_recovery_setting">ƏS ilə birgə Lineage Geri qaytarma rejimini də güncəllə</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Hərəkət</string>
+    <string name="navigation_summary">Tərcih edilən naviqasiya üsulunu seçin</string>
+    <string name="gesture_navigation">Jest hərəkəti</string>
+    <string name="two_button_navigation">2 düyməli hərəkət</string>
+    <string name="navbar_navigation">3 düyməli hərəkət</string>
+    <string name="hide_gesture_hint">Jestlə hərəkət məsləhətini gizlət</string>
+    <string name="location_agps_access_summary">Yerləşmə açıq olduqda, <b>peyk köməkçi datalarını internetdən endirin</b>, bu GPS-in başlatma performansını əhəmiyyətli dərəcədə artıra bilər.</string>
 </resources>

res/values-be/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,50 +16,43 @@
      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_welcome_message">Вітаем у <xliff:g id="name" example="LineageOS">%1$s</xliff:g></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="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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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="default">Абараніце свой тэлефон</string>
+    <string name="lockscreen_setup_title" product="tablet">Абараніце свой планшэт</string>
+    <string name="lockscreen_setup_screen_lock_setup">Наладзіць</string>
+    <string name="intro_restore_title">Аднавіць праграмы і даныя</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Навігацыя</string>
+    <string name="gesture_navigation">Навігацыя жэстамі</string>
+    <string name="location_agps_access_summary">Калі месцазнаходжанне ўключана, <b>спампуйце даныя дапамогі спадарожнікаў з інтэрнэту</b>, якія могуць значна падвысіць хуткасць запуску GPS.</string>
 </resources>

res/values-bg/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -39,9 +39,6 @@
     <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> данни за приложенията, 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_no_service">Няма поддръжка</string>
@@ -51,29 +48,34 @@
     <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="accessibility_settings">Настройки на достъпност</string>
     <string name="setup_services">LineageOS функции</string>
-    <string name="services_explanation" product="tablet">Тези услуги работят за да разширят възможностите на таблета. Данните ще бъдат използвани в съгласие с LineageOS\'s в <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">Тези услуги работят за да разширят възможностите на телефона. Данните ще бъдат използвани в съгласие с LineageOS\'s в <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Декларация за поверителност</string>
+    <string name="services_pp_explanation">Тези услуги работят за вас, за да разширите възможностите на вашето устройство. Данните ще бъдат използвани в съответствие с<xliff:g id="name" example="LineageOS">%1$s</xliff:g> политика за поверителност.</string>
+    <string name="services_find_privacy_policy">Можете да прочетете политиката за поверителност на друго устройство, като посетите <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></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\'s. Тази информация не може да се използва за идентифицирането ви и служи да помага на екипите работещи над неща като живот на батерията, производителността на приложенията и нови функции в <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> чрез автоматично изпращане на диагностични данни и данни за употреба до <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Тази информация не може да се използва, за да ви идентифицира и помага на екипи, работещи по неща като живот на батерията, производителност на приложенията и нови <xliff:g id="name" example="LineageOS">%3$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_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>
-    <string name="lockscreen_setup_title" product="tablet">Защитете вашия таблет</string>
     <string name="lockscreen_setup_title" product="default">Защитете телефона си</string>
+    <string name="lockscreen_setup_title" product="tablet">Защитете вашия таблет</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_button">Възстановяване от архив</string>
+    <string name="update_recovery_title">Актуализиране на Lineage Recovery</string>
+    <string name="update_recovery_description">Актуализира Lineage Recovery при първо зареждане след всяка актуализация.</string>
+    <string name="update_recovery_warning">Recovery ще се актуализира веднага щом завършите настройката. Ако искате да го запазите непокътнат, деактивирайте тази функция.</string>
+    <string name="update_recovery_setting">Актуализирайте Lineage Recovery заедно с операционната система</string>
 </resources>

res/values-bn/strings.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-2015 The CyanogenMod Project
+     Copyright (C) 2017-2020, 2022 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_welcome_message"><xliff:g id="name" example="LineageOS">%1$s</xliff:g> এ আপনাকে স্বাগতম!</string>
+    <string name="setup_locale">ভাষা</string>
+    <string name="setup_wifi">Wi-Fi নির্বাচন করুন</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">তারিখ &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="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_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> কে সাহায্য করুন সয়ংক্রিয়ভাবে ইউজেজ ও ডায়াগনস্টিক ডাটা 
+<xliff:g id="name" example="LineageOS">%2$s</xliff:g> কে পাঠানোর মাধ্যমে। এই তথ্য দ্বারা আপনাকে চিহ্নিত করা যাবে না এবং আপনি এর মাধ্যমে প্রজেক্ট এর দলকে বিভিন্ন <xliff:g id="name" example="LineageOS">%3$s</xliff:g> ফিচার তৈরিতে সাহায্য করতে পারবেন।</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></string>
+    <string name="fingerprint_setup_title">আঙ্গুলের ছাপ সেটআপ</string>
+    <string name="lockscreen_setup_screen_lock_setup">সেট আপ করুন</string>
+    <string name="update_recovery_title">লিনিয়েজ রিকভারি আপডেট করুন</string>
+    <string name="update_recovery_description">প্রতিবার আপডেট সম্পন্ন হওয়ার পর প্রথম বুটে লিনিয়েজ রিকভারি আপডেট করে</string>
+    <string name="update_recovery_warning">সেটআপটি সম্পন্ন করার সাথে সাথে রিকভারি আপডেট হয়ে যাবে। আপনি যদি রিকভারি আপডেট করতে না চান, এই ফিচারটি অক্ষম করুন।</string>
+    <string name="update_recovery_setting">OS এর সাথে সাথে লিনিয়েজ রিকভারি আপডেট করুন</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">ন্যাভিগেশন</string>
+    <string name="navigation_summary">আপনার পছন্দের ন্যাভিগেশন মাধ্যম বেছে নিন</string>
+    <string name="gesture_navigation">জেশচার ন্যাভিগেশন</string>
+    <string name="two_button_navigation">দ্বি-বোতাম ন্যাভিগেশন</string>
+    <string name="navbar_navigation">ত্রি-বোতাম ন্যাভিগেশন</string>
+</resources>

res/values-bs/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,5 +17,4 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="services_help_improve_cm">Pomozite poboljš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> tako što dozvolite automatsko slanje podataka o korištenju LineageOS. Ove informacije ne mogu biti korištene da vas se identifikuje, a pomaže timu koji radi na poboljšanju trajanja baterije, izvršavanju aplikacija, i novim <xliff:g id="name" example="LineageOS">%2$s</xliff:g> značajkama.</string>
 </resources>

res/values-ca/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Només un seg\u2026</string>
     <string name="setup_complete">Configuració completa</string>
     <string name="setup_welcome">Benvingut</string>
+    <string name="setup_welcome_message">Benvingut a <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Idioma</string>
     <string name="setup_wifi">Selecciona Wi-Fi</string>
     <string name="setup_sim_missing">Falta la targeta SIM</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Quina SIM vols utilitzar per a les dades? La SIM seleccionada pot provocar càrrecs per part de l\'operador ja que servirà per configurar la teva tauleta.</string>
     <string name="choose_data_sim_summary" product="default">Quina SIM vols utilitzar per a les dades? La SIM seleccionada pot provocar càrrecs per part de l\'operador ja que servirà per configurar el teu telèfon.</string>
     <string name="date_time_summary">Estableix el teu fus horari i ajusta la data i hora actual si és necessari</string>
-    <string name="backup_data_summary"><b>Fes una còpia de seguretat</b> de les dades de les aplicacions, contrasenyes Wi-Fi, i altres configuracions als servidors de Google</string>
-    <string name="other_services_summary">Aquests serveis posen a Google a treballar per a tu, i pots activar-los o desactivar-los en qualsevol moment. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de Google.</string>
-    <string name="location_services_summary">Els serveis d\'ubicació permeten al sistema i a aplicacions de tercers recopilar i utilitzar dades com la teva ubicació aproximada. Per exemple, una aplicació pot utilitzar la teva ubicació aproximada per localitzar cafeteries als voltants.</string>
     <string name="location_access_summary"><b>Permet a les aplicacions que han demanat el teu permís</b> utilitzar la teva informació d\'ubicació. Això pot incloure la teva ubicació i ubicacions anteriors.</string>
     <string name="setup_mobile_data">Encén les dades mòbils</string>
     <string name="setup_mobile_data_no_service">Sense servei</string>
@@ -51,29 +49,45 @@
     <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">Trucada d\'emergència</string>
+    <string name="accessibility_settings">Configuració d\'accessibilitat</string>
     <string name="setup_services">Característiques de LineageOS</string>
-    <string name="services_explanation" product="tablet">Aquests serveis serveixen per ampliar les capacitats de la teva tauleta. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_explanation" product="default">Aquests serveis serveixen per ampliar les capacitats del teu telèfon. Les dades s\'utilitzaran d\'acord amb la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_privacy_policy">Política de privacitat</string>
+    <string name="services_pp_explanation">Aquests serveis funcionen per ampliar les capacitats del vostre dispositiu. Les dades s\'utilitzaran d\'acord amb la política de privadesa de &lt;xliff:g id="name" example="LineageOS"&gt;.</string>
+    <string name="services_find_privacy_policy">Podeu llegir la política de privadesa en un altre dispositiu visitant <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Ajuda a millorar <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> enviant automàticament les dades de diagnòstic i d\'ús a LineageOS. Aquesta informació no es pot utilitzar per identificar-te i dóna un cop de mà als equips que treballen en coses com la duració de les bateries, el rendiment de les aplicacions i noves característiques de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
+    <string name="services_metrics_label">&lt;xliff:g id="name" example="Help improve LineageOS"&gt; enviant automàticament dades de diagnòstic i d\'ús a &lt;xliff:g id="name" example="LineageOS"&gt;. Aquesta informació no es pot utilitzar per identificar-vos i dóna un cop de mà als equips que treballen en coses com ara la durada de la bateria, el rendiment de les aplicacions i les noves característiques de &lt;xliff:g id="name" example="LineageOS"&gt;.</string>
     <string name="services_os_nav_keys_label"><b>Utilitza les tecles de navegació en pantalla</b> enlloc de les tecles físiques.</string>
-    <string name="setup_unlock">Desbloqueja</string>
-    <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="services_full_description"><xliff:g id="pp_explanation"/>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Protegeix la tauleta</string>
     <string name="lockscreen_setup_title" product="default">Protegeix el teu telèfon</string>
+    <string name="lockscreen_setup_title" product="device">Protegiu el vostre dispositiu</string>
+    <string name="lockscreen_setup_title" product="tablet">Protegeix la tauleta</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">Si teniu una còpia de seguretat del vostre darrer dispositiu <xliff:g id="name" example="LineageOS">%s</xliff:g>, podeu restaurar-la aquí.</string>
+    <string name="intro_restore_button">Restaura des de la còpia de seguretat</string>
+    <string name="update_recovery_title">Actualització del recuperador del Lineage</string>
+    <string name="update_recovery_description">Actualitza el recuperador del Lineage en el primer inici posterior a cada actualització.</string>
+    <string name="update_recovery_warning">La recuperació s\'actualitzarà tan bon punt hàgiu acabat la configuració. Si voleu mantenir-lo intacte, desactiveu aquesta funció.</string>
+    <string name="update_recovery_setting">Actualitza el recuperador del Lineage juntament amb el sistema operatiu</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navegació</string>
+    <string name="navigation_summary">Trieu el mètode de navegació preferit</string>
+    <string name="gesture_navigation">Navegació gestual</string>
+    <string name="two_button_navigation">Navegació de 2 botons</string>
+    <string name="navbar_navigation">Navegació de 3 botons</string>
+    <string name="hide_gesture_hint">Amaga l\'indicador de navegació gestual</string>
+    <string name="location_agps_access_summary">Quan la ubicació està activada, <b>baixa dades d\'assistència satelital d\'Internet</b>, cosa que pot millorar en gran mesura el rendiment inicial del GPS.</string>
 </resources>

res/values-cs/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Jen chvilku\u2026</string>
     <string name="setup_complete">Instalace je dokončena</string>
     <string name="setup_welcome">Vítejte</string>
+    <string name="setup_welcome_message">Vítejte v\u00a0<xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Jazyk</string>
     <string name="setup_wifi">Vyberte Wi\u2011Fi</string>
     <string name="setup_sim_missing">Chybí karta SIM</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Kterou SIM kartu chcete použít pro mobilní data? Mohou být na ní účtovány poplatky.</string>
     <string name="choose_data_sim_summary" product="default">Kterou SIM kartu chcete použít pro mobilní data? Mohou být na ní účtovány poplatky.</string>
     <string name="date_time_summary">Je-li třeba, nastavte časové pásmo a upravte aktuální datum a čas</string>
-    <string name="backup_data_summary"><b>Zálohovat</b> data aplikací, hesla Wi\u2011Fi a další nastavení do účtu Google</string>
-    <string name="other_services_summary">Tyto služby Vám nabízí Google a Vy je můžete kdykoliv povolit či zakázat. Data budou použita v souladu se zásadami ochrany osobních údajů Google - <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Určování polohy umožňuje systému a dalším aplikacím sbírat data a používat je jako vaši přibližnou polohu. Aplikace tak může například vaši přibližnou polohu k nalezení blízkých kaváren.</string>
     <string name="location_access_summary"><b>Povolí aplikacím, které žádaly oprávnění</b> použít vaše informace o poloze. To může zahrnovat vaši aktuální, ale i minulé polohy.</string>
     <string name="setup_mobile_data">Zapnout mobilní data</string>
     <string name="setup_mobile_data_no_service">Žádná síť</string>
@@ -51,29 +49,45 @@
     <string name="yes">Ano</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">Tísňové volání</string>
+    <string name="accessibility_settings">Nastavení přístupnosti</string>
     <string name="setup_services">LineageOS funkce</string>
-    <string name="services_explanation" product="tablet">Tyto služby rozšiřují funkce vašeho tabletu. Data budou použita v souladu se zásadami ochrany osobních údajů LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">Tyto služby rozšiřují funkce vašeho telefonu. Data budou použita v souladu se zásadami ochrany osobních údajů LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Zásady ochrany osobních údajů</string>
+    <string name="services_pp_explanation">Tyto služby rozšiřují funkce vašeho zařízení. Data budou použita v souladu se zásadami ochrany osobních údajů <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">Zásady ochrany osobních údajů si můžete přečíst na jiném zařízení navštívením odkazu <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Pomozte vylepšit <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> automatickým odesíláním diagnostických dat a dat o používání do LineageOS. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových vlastností pro <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Pomozte vylepšit LineageOS">%1$s</xliff:g> automatickým odesíláním diagnostických dat a dat o používání <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Tato data nelze použít pro Vaší identifikaci, ale pomohou vývojářskému týmu s informacemi o výdrži baterie, výkonu aplikací a vývoji nových funkcí pro <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Použít navigační klávesy na obrazovce</b> namísto hw kláves.</string>
-    <string name="setup_unlock">Odemknout</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Zabezpečte svůj tablet</string>
     <string name="lockscreen_setup_title" product="default">Chraňte svůj telefon</string>
+    <string name="lockscreen_setup_title" product="device">Ochraňte své zařízení</string>
+    <string name="lockscreen_setup_title" product="tablet">Zabezpečte svůj tablet</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">Jestliže máte zálohu z předešlého <xliff:g id="name" example="LineageOS">%s</xliff:g> zařízení, můžete ji obnovit zde.</string>
+    <string name="intro_restore_button">Obnovit ze zálohy</string>
+    <string name="update_recovery_title">Aktualizovat Lineage recovery</string>
+    <string name="update_recovery_description">Aktualizace Lineage recovery při prvním spuštění po každé aktualizaci</string>
+    <string name="update_recovery_warning">Oddíl recovery bude aktualizován ihned poté, co dokončíte nastavení. Vypněte tuto funkci, jestliže si přejete ponechat oddíl nezměněný.</string>
+    <string name="update_recovery_setting">Aktualizovat Lineage recovery společně s OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigace</string>
+    <string name="navigation_summary">Zvolte preferovanou metodu navigace</string>
+    <string name="gesture_navigation">Ovládání gesty</string>
+    <string name="two_button_navigation">Navigace dvěma tlačítky</string>
+    <string name="navbar_navigation">Navigace třemi tlačítky</string>
+    <string name="hide_gesture_hint">Skrýt napovědy navigačních gest</string>
+    <string name="location_agps_access_summary">Když je poloha zapnutá, <b>stahujte data satelitní asistence z internetu</b>, což může výrazně zlepšit výkon spuštění systému GPS.</string>
 </resources>

res/values-cy/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Un eiliad\u2026</string>
     <string name="setup_complete">Mae\'r gosodiad wedi ei gwblhau.</string>
     <string name="setup_welcome">Croeso</string>
+    <string name="setup_welcome_message">Croeso i <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Iaith</string>
     <string name="setup_wifi">Dewis Wi-Fi</string>
     <string name="setup_sim_missing">Cerdyn SIM ar goll</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Pa gerdyn SIM wyt ti am ddefnyddio ar gyfer data? Bydd y SIM hwn yn cael yn ei ddefnyddio wrth sefydlu dy lechen ac mae\'n bosib y bydd costau data, yn dibynnu ar dy gytundeb rhwydwaith symudol.</string>
     <string name="choose_data_sim_summary" product="default">Pa gerdyn SIM wyt ti am ddefnyddio ar gyfer data? Bydd y SIM hwn yn cael yn ei ddefnyddio wrth sefydlu dy ffôn ac mae\'n bosib y bydd costau data, yn dibynnu ar dy gytundeb rhwydwaith symudol.</string>
     <string name="date_time_summary">Gosoda dy gylchfa amser ac addasu’r dyddiad ac amser os oes angen.</string>
-    <string name="backup_data_summary"><b>Cadw copi wrth gefn</b> o ddata apiau, cyfrineiriau Wi-Fi, a gosodiadau eraill i weinyddion Google</string>
-    <string name="other_services_summary">Mae\'r gwasanaethau hyn yn rhoi Google ar waith i ti. Mae\'n bosib eu troi ymlaen ac i ffwrdd unrhyw bryd. Caiff data ei ddefnyddio yn ôl <xliff:g id="name" example="Privacy Policy">%s</xliff:g> Google.</string>
-    <string name="location_services_summary">Mae gwasanaethau lleoliad yn caniatáu i apiau system a thrydydd parti medru casglu a defnyddio data megis dy leoliad bras. Er enghraifft, gall ap ddefnyddio dy leoliad bras er mwyn awgrymu llefydd gerllaw am banad, paned neu ddisgled.</string>
     <string name="location_access_summary"><b>Caniatáu i apiau sydd wedi gofyn am dy ganiatâd</b> medru defnyddio gwybodaeth dy leoliad. Gall hyn gynnwys dy leoliad cyfredol a lleoliadau yn y gorffennol.</string>
     <string name="setup_mobile_data">Defnyddio data symudol</string>
     <string name="setup_mobile_data_no_service">Dim gwasanaeth</string>
@@ -51,29 +49,44 @@
     <string name="yes">Iawn</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">Galwad brys</string>
+    <string name="accessibility_settings">Gosodiadau hygyrchedd</string>
     <string name="setup_services">Nodweddion LineageOS</string>
-    <string name="services_explanation" product="tablet">Mae\'r nodweddion hyn yn gweithio er mwyn ymestyn galluoedd dy lechen. Caiff data ei ddefnyddio yn ôl <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
-    <string name="services_explanation" product="default">Mae\'r nodweddion hyn yn gweithio er mwyn ymestyn galluoedd dy ffôn. Caiff data ei ddefnyddio yn ôl <xliff:g id="name" example="Privacy Policy">%s</xliff:g> LineageOS.</string>
-    <string name="services_privacy_policy">Polisi Preifatrwydd</string>
+    <string name="services_pp_explanation">Mae\'r gwasanaethau hyn yn gweithio i ti fedru ymestyn gallu dy ddyfais. Caiff data ei ddefnyddio yn ôl polisi preifatrwydd <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">Gellir darllen y polisi preifatrwydd ar ddyfais arall wrth ymweld â <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Helpu i wella <xliff:g id="name" example="CyanogenMod">%s</xliff:g></string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve CyanogenMod">%1$s</xliff:g> gan anfon gwybodaeth ddiagnostig a defnydd data at LineageOS. Ni fydd yn bosib defnyddio\'r wybodaeth i dy adnabod di ac mi fydd o help mawr i\'r timau sy\'n gweithio ar bethau fel gwella perfformiad apiau a bywyd batri a chreu nodweddion newydd yn <xliff:g id="name" example="CyanogenMod">%2$s</xliff:g>.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> wrth anfon gwybodaeth ddiagnostig a defnydd data at <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Ni fydd yn bosib defnyddio\'r wybodaeth i dy adnabod di ac mi fydd o help mawr i\'r timau sy\'n gweithio ar bethau fel gwella perfformiad apiau a bywyd batri a chreu nodweddion newydd yn <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Defnyddio bysellau llywio ar y sgrin</b> yn hytrach na botymau\'r ddyfais.</string>
-    <string name="setup_unlock">Datgloi</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Diogelu dy lechen</string>
     <string name="lockscreen_setup_title" product="default">Diogelu dy ffôn</string>
+    <string name="lockscreen_setup_title" product="device">Diogelu dy ddyfais</string>
+    <string name="lockscreen_setup_title" product="tablet">Diogelu dy lechen</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">Os oes gennyt gopi wrth gefn o dy ddyfais <xliff:g id="name" example="LineageOS">%s</xliff:g> diwethaf, gellir ei adfer fan hyn.</string>
+    <string name="intro_restore_button">Adfer o gopi wrth gefn</string>
+    <string name="update_recovery_title">Diweddaru Modd Adfer Lineage </string>
+    <string name="update_recovery_description">Mae\'n diweddaru Lineage Recovery wrth y cychwyn cyntaf wedi pob diweddariad.</string>
+    <string name="update_recovery_warning">Caiff Recovery ei ddiweddaru yn syth ar ôl cwblhau\'r gosod. Os hoffet ti ei gadw\'n gyfan, analluoga\'r nodwedd hon.</string>
+    <string name="update_recovery_setting">Diweddaru Lineage Recovery ochr yn ochr â\'r OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Llywio</string>
+    <string name="navigation_summary">Dewisa pa ddull llywio sydd well gennyt</string>
+    <string name="gesture_navigation">Llywio ag ystumiau</string>
+    <string name="two_button_navigation">Llywio 2-fotwm</string>
+    <string name="navbar_navigation">Llywio 3-botwm</string>
+    <string name="hide_gesture_hint">Cuddio hintiau llywio ag ystumiau</string>
 </resources>

res/values-da/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -23,7 +23,9 @@
     <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_welcome_message">Velkommen til <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Sprog</string>
     <string name="setup_wifi">Vælg Wi-Fi</string>
     <string name="setup_sim_missing">SIM-kort mangler</string>
@@ -38,37 +40,52 @@
     <string name="choose_data_sim_summary" product="tablet">Hvilket SIM ønsker du at bruge til data? Det valgte SIM kan medføre netværksudgifter, da det vil blive brugt til at indstille din tablet-computer.</string>
     <string name="choose_data_sim_summary" product="default">Hvilket SIM ønsker du at bruge til data? Det valgte SIM kan medføre netværksudgifter, da det vil blive brugt til at indstille din telefon.</string>
     <string name="date_time_summary">Angiv din tidszone og justér aktuel dato og tid, hvis det behøves</string>
-    <string name="backup_data_summary"><b>Sikkerhedskopiér</b> appdata, Wi-Fi adgangskoder, og andre indstillinger til Google\'s servere</string>
-    <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>
     <string name="no">Nej</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">Nødopkald</string>
+    <string name="accessibility_settings">Hjælpefunktioner</string>
     <string name="setup_services">LineageOS-funktioner</string>
-    <string name="services_explanation" product="tablet">Disse tjenester arbejder for at du kan udvide din tablet-computers funktionalitet. Data vil blive brugt i overensstemmelse med LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">Disse tjenester arbejder for at du kan udvide din telefons funktionalitet. Data vil blive brugt i overensstemmelse med LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Privatlivspolitik</string>
+    <string name="services_pp_explanation">&lt;xliff:g id="name" example="LineageOS"&gt;Disse tjenester virker for at udvide funktionerne på din enhed. Data vil blive brugt i overensstemmelse med  &lt;xliff:g id="name" example="LineageOS"&gt;%1$s&lt;/xliff:g&gt;\'s privatlivspolitik.</string>
+    <string name="services_find_privacy_policy">Du kan læse privatlivspolitikken på en anden enhed ved at besøge <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Hjælp med at forbedre <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> ved automatisk at sende diagnostik and brugsdata to LineageOS. Denne information kan ikke bruges til at identificere dig og giver en hånd til hold, som arbejder på ting som batterilevetid, app-ydeevne, and nye <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-funktioner.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> ved automatisk at sende diagnose og forbrugsdata til <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Denne information kan ikke bruge til at identificere dig men giver en hjælpende hånd til de hold der arbejder med batteri levetid, app præstation og nye<xliff:g id="name" example="LineageOS">%3$s</xliff:g> funktioner.</string>
     <string name="services_os_nav_keys_label"><b>Brug navigationstaster på skærm</b> i stedet for fysiske-taster.</string>
-    <string name="setup_unlock">Lås op</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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="face_setup_title">Ansigt opsætning</string>
+    <string name="face_setup_summary">For at bruge dit ansigt til at låse din skærm op, skal du:</string>
+    <string name="face_setup_add_face">Tilføj dit ansigt</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>
     <string name="lockscreen_setup_title" product="default">Beskyt din telefon</string>
+    <string name="lockscreen_setup_title" product="tablet">Beskyt din tablet</string>
     <string name="lockscreen_setup_summary"><b>Beskyt denne enhed</b>, og kræv en PIN, et mønster, eller en adgangskode, for at låse skærmen op</string>
     <string name="lockscreen_setup_screen_lock_setup">Opsætning</string>
+    <string name="intro_restore_title">Gendan apps og data</string>
+    <string name="intro_restore_button">Gendan fra backup</string>
+    <string name="update_recovery_title">Opdater Lineage Genddanelse</string>
+    <string name="update_recovery_description">Opdateringer Lineage Recovery ved første opstart efter hver opdatering.</string>
+    <string name="update_recovery_warning">Gendannelse vil blive opdateret, så snart du er færdig med opsætningen. Hvis du ønsker at holde det intakt, skal du deaktivere denne funktion.</string>
+    <string name="update_recovery_setting">Opdater Lineage Recovery sammen med OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Vælg foretrukken navigationsmetode</string>
+    <string name="gesture_navigation">Navigering med bevægelser</string>
+    <string name="two_button_navigation">Navigering med to knapper</string>
+    <string name="navbar_navigation">Navigering med tre knapper</string>
+    <string name="hide_gesture_hint">Skjul bevægelses navigerings hint</string>
+    <string name="location_agps_access_summary">Når lokation er tændt, <b>download satellit hjælpedata fra internettet</b>, som kan hjælpe meget med GPS opstartsfunktion</string>
 </resources>

res/values-de/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Einen Moment\u2026</string>
     <string name="setup_complete">Einrichtung abgeschlossen</string>
     <string name="setup_welcome">Willkommen</string>
+    <string name="setup_welcome_message">Willkommen bei <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Sprache</string>
     <string name="setup_wifi">WLAN auswählen</string>
     <string name="setup_sim_missing">SIM-Karte fehlt</string>
@@ -34,46 +35,59 @@
     <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_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="accessibility_settings">Einstellungen zur Barrierefreiheit</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_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_pp_explanation">Diese Dienste werden verwendet, um die Funktionen deines Gerätes zu erweitern. Deine Daten werden in Übereinstimmung mit der <xliff:g id="name" example="LineageOS">%1$s</xliff:g> Datenschutzerklärung verwendet.</string>
+    <string name="services_find_privacy_policy">Du kannst die Datenschutzbestimmungen auf einem anderen Gerät lesen, indem du <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> aufrufst.</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 <xliff:g id="name" example="LineageOS">%2$s</xliff:g> sendest. Diese Informationen können nicht verwendet werden, um dich zu identifizieren und helfen den Teams, die an Dingen wie Akkulaufzeit, App-Leistung und neuen <xliff:g id="name" example="LineageOS">%3$s</xliff:g>-Funktionen arbeiten.</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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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="default">Schütze dein Telefon</string>
+    <string name="lockscreen_setup_title" product="device">Gerät schützen</string>
+    <string name="lockscreen_setup_title" product="tablet">Schütze dein Tablet</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">Falls du ein Backup von deinem vorherigen <xliff:g id="name" example="LineageOS">%s</xliff:g>-Gerät hast, kannst du es hier wiederherstellen.</string>
+    <string name="intro_restore_button">Aus Backup wiederherstellen</string>
+    <string name="update_recovery_title">Lineage-Recovery aktualisieren</string>
+    <string name="update_recovery_description">Aktualisiert das Lineage-Recovery-Image beim ersten Start nach jedem Update.</string>
+    <string name="update_recovery_warning">Das Recovery-Image wird aktualisiert, sobald du die Einrichtung abgeschlossen hast. Wenn es unverändert bleiben soll, deaktiviere diese Funktion.</string>
+    <string name="update_recovery_setting">Lineage-Recovery zusammen mit dem Betriebssystem aktualisieren</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Bevorzugte Steuerungsmethode auswählen</string>
+    <string name="gesture_navigation">Steuerung durch Gesten</string>
+    <string name="two_button_navigation">2-Tasten-Steuerung</string>
+    <string name="navbar_navigation">3-Tasten-Steuerung</string>
+    <string name="hide_gesture_hint">Gestensteuerungshinweis ausblenden</string>
+    <string name="location_agps_access_summary">Wenn die Standortbestimmung eingeschaltet ist, kannst du <b>Satellitenhilfsdaten aus dem Internet herunterladen</b>, wodurch der Startvorgang von GPS deutlich beschleunigt werden kann.</string>
 </resources>

res/values-el/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Μισό λεπτό\u2026</string>
     <string name="setup_complete">Η εγκατάσταση ολοκληρώθηκε</string>
     <string name="setup_welcome">Καλώς ήλθατε</string>
+    <string name="setup_welcome_message">Καλώς ήλθατε στο <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Γλώσσα</string>
     <string name="setup_wifi">Επιλέξτε Wi-Fi</string>
     <string name="setup_sim_missing">Η κάρτα SIM λείπει</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Ποιά SIM θέλετε να χρησιμοποιήσετε για τα δεδομένα; Η επιλεγμένη SIM μπορεί να επιφέρει χρεώσεις δικτύου, αφού θα χρησιμοποιηθεί για τη ρύθμιση του tablet σας.</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> της 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>
@@ -51,29 +49,45 @@
     <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="accessibility_settings">Ρυθμίσεις προσβασιμότητας</string>
     <string name="setup_services">Χαρακτηριστικά LineageOS</string>
-    <string name="services_explanation" product="tablet">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες του 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_pp_explanation">Οι υπηρεσίες αυτές έχουν σκοπό να επεκτείνουν τις δυνατότητες της συσκευής σας. Τα δεδομένα θα χρησιμοποιηθούν σύμφωνα με την πολιτική απορρήτου του <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">Μπορείτε να διαβάσετε την πολιτική απορρήτου σε μια άλλη συσκευή επισκεπτόμενοι το <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></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_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> στέλνοντας αυτόματα διαγνωστικά δεδομένα και στατιστικά χρήσης στο <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Αυτές οι πληροφορίες δε μπορούν να χρησιμοποιηθούν για να σας αναγνωρίσουν και δίνουν ένα χέρι βοηθείας στις ομάδες που εργάζονται σε θέματα όπως η διάρκεια ζωής μπαταρίας, επιδόσεις εφαρμογών και νέα χαρακτηριστικά του <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_title">Επιλέξτε δευτερεύον κλείδωμα οθόνης</string>
-    <string name="settings_fingerprint_setup_details">Πώς θα θέλατε να κλειδώνετε την οθόνη σας;</string>
+    <string name="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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">Προστατέψτε το tablet σας</string>
     <string name="lockscreen_setup_title" product="default">Προστατέψτε το τηλέφωνό σας</string>
+    <string name="lockscreen_setup_title" product="device">Προστατέψτε τη συσκευή σας</string>
+    <string name="lockscreen_setup_title" product="tablet">Προστατέψτε το tablet σας</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">Εάν έχετε αντίγραφο ασφαλείας από την τελευταία <xliff:g id="name" example="LineageOS">%s</xliff:g> συσκευή σας, μπορείτε να το επαναφέρετε εδώ.</string>
+    <string name="intro_restore_button">Επαναφορά από αντίγραφο ασφαλείας</string>
+    <string name="update_recovery_title">Ενημέρωση Lineage Recovery</string>
+    <string name="update_recovery_description">Ενημέρωση της Lineage Recovery στην πρώτη εκκίνηση μετά από κάθε ενημέρωση.</string>
+    <string name="update_recovery_warning">Η Recovery θα ενημερωθεί μόλις ολοκληρώσετε τη ρύθμιση. Αν θέλετε να κρατήσετε την τρέχουσα recovery, απενεργοποιήστε αυτή την επιλογή.</string>
+    <string name="update_recovery_setting">Ενημέρωση Lineage Recovery παράλληλα με το λειτουργικό σύστημα</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Πλοήγηση</string>
+    <string name="navigation_summary">Επιλογή προτιμώμενης μεθόδου πλοήγησης</string>
+    <string name="gesture_navigation">Πλοήγηση με χειρονομίες</string>
+    <string name="two_button_navigation">Πλοήγηση με δύο πλήκτρα</string>
+    <string name="navbar_navigation">Πλοήγηση με τρία πλήκτρα</string>
+    <string name="hide_gesture_hint">Απόκρυψη υποδείξεων πλοήγησης με χειρονομίες</string>
+    <string name="location_agps_access_summary">Όταν η τοποθεσία είναι ενεργοποιημένη, <b>λήψη δεδομένων δορυφορικής βοήθειας από το διαδίκτυο</b>, τα οποία μπορούν να βελτιώσουν σημαντικά την απόδοση εκκίνησης GPS.</string>
 </resources>

res/values-en-rAU/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Just a sec\u2026</string>
     <string name="setup_complete">Setup is complete</string>
     <string name="setup_welcome">Welcome</string>
+    <string name="setup_welcome_message">Welcome to <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Language</string>
     <string name="setup_wifi">Select Wi-Fi</string>
     <string name="setup_sim_missing">SIM card missing</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
     <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
     <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
-    <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
-    <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
     <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
     <string name="setup_mobile_data">Turn on mobile data</string>
     <string name="setup_mobile_data_no_service">No service</string>
@@ -51,29 +49,45 @@
     <string name="yes">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">Emergency call</string>
+    <string name="accessibility_settings">Accessibility settings</string>
     <string name="setup_services">LineageOS features</string>
-    <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Privacy Policy</string>
+    <string name="services_pp_explanation">These services work for you to extend the capabilities of your device. Data will be used in accordance with <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s privacy policy.</string>
+    <string name="services_find_privacy_policy">You can read the privacy policy on another device by visiting <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Help improve <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> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="setup_unlock">Unlock</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</string>
     <string name="lockscreen_setup_title" product="default">Protect your phone</string>
+    <string name="lockscreen_setup_title" product="device">Protect your device</string>
+    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</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">If you have a backup from your last <xliff:g id="name" example="LineageOS">%s</xliff:g> device, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
+    <string name="update_recovery_title">Update Lineage Recovery</string>
+    <string name="update_recovery_description">Updates Lineage Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_warning">Recovery will be updated as soon as you finish the setup. If you wish to keep it intact, disable this feature.</string>
+    <string name="update_recovery_setting">Update Lineage Recovery alongside the OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Choose preferred navigation method</string>
+    <string name="gesture_navigation">Gesture navigation</string>
+    <string name="two_button_navigation">2-button navigation</string>
+    <string name="navbar_navigation">3-button navigation</string>
+    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
+    <string name="location_agps_access_summary">When location is on, <b>download satellite assistance data from the internet</b>, which can greatly improve the GPS startup performance.</string>
 </resources>

res/values-en-rCA/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Just a sec\u2026</string>
     <string name="setup_complete">Setup is complete</string>
     <string name="setup_welcome">Welcome</string>
+    <string name="setup_welcome_message">Welcome to <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Language</string>
     <string name="setup_wifi">Select Wi-Fi</string>
     <string name="setup_sim_missing">SIM card missing</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
     <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
     <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
-    <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
-    <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
     <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
     <string name="setup_mobile_data">Turn on cellular data</string>
     <string name="setup_mobile_data_no_service">No service</string>
@@ -51,29 +49,45 @@
     <string name="yes">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">Emergency call</string>
+    <string name="accessibility_settings">Accessibility settings</string>
     <string name="setup_services">LineageOS features</string>
-    <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Privacy Policy</string>
+    <string name="services_pp_explanation">These services work for you to extend the capabilities of your device. Data will be used in accordance with <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s privacy policy.</string>
+    <string name="services_find_privacy_policy">You can read the privacy policy on another device by visiting <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Help improve <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> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="setup_unlock">Unlock</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</string>
     <string name="lockscreen_setup_title" product="default">Protect your phone</string>
+    <string name="lockscreen_setup_title" product="device">Protect your device</string>
+    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</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">If you have a backup from your last <xliff:g id="name" example="LineageOS">%s</xliff:g> device, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
+    <string name="update_recovery_title">Update Lineage Recovery</string>
+    <string name="update_recovery_description">Updates Lineage Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_warning">Recovery will be updated as soon as you finish the setup. If you wish to keep it intact, disable this feature.</string>
+    <string name="update_recovery_setting">Update Lineage Recovery alongside the OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Choose preferred navigation method</string>
+    <string name="gesture_navigation">Gesture navigation</string>
+    <string name="two_button_navigation">2-button navigation</string>
+    <string name="navbar_navigation">3-button navigation</string>
+    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
+    <string name="location_agps_access_summary">When location is on, <b>download satellite assistance data from the internet</b>, which can greatly improve the GPS startup performance.</string>
 </resources>

res/values-en-rGB/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Just a sec\u2026</string>
     <string name="setup_complete">Setup is complete</string>
     <string name="setup_welcome">Welcome</string>
+    <string name="setup_welcome_message">Welcome to <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Language</string>
     <string name="setup_wifi">Select Wi-Fi</string>
     <string name="setup_sim_missing">SIM card missing</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
     <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
     <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
-    <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
-    <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
     <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
     <string name="setup_mobile_data">Turn on mobile data</string>
     <string name="setup_mobile_data_no_service">No service</string>
@@ -51,29 +49,45 @@
     <string name="yes">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">Emergency call</string>
+    <string name="accessibility_settings">Accessibility settings</string>
     <string name="setup_services">LineageOS features</string>
-    <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Privacy Policy</string>
+    <string name="services_pp_explanation">These services work for you to extend the capabilities of your device. Data will be used in accordance with <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s privacy policy.</string>
+    <string name="services_find_privacy_policy">You can read the privacy policy on another device by visiting <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Help improve <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> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="setup_unlock">Unlock</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</string>
     <string name="lockscreen_setup_title" product="default">Protect your phone</string>
+    <string name="lockscreen_setup_title" product="device">Protect your device</string>
+    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</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">If you have a backup from your last <xliff:g id="name" example="LineageOS">%s</xliff:g> device, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
+    <string name="update_recovery_title">Update Lineage Recovery</string>
+    <string name="update_recovery_description">Updates Lineage Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_warning">Recovery will be updated as soon as you finish the setup. If you wish to keep it intact, disable this feature.</string>
+    <string name="update_recovery_setting">Update Lineage Recovery alongside the OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Choose preferred navigation method</string>
+    <string name="gesture_navigation">Gesture navigation</string>
+    <string name="two_button_navigation">2-button navigation</string>
+    <string name="navbar_navigation">3-button navigation</string>
+    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
+    <string name="location_agps_access_summary">When location is on, <b>download satellite assistance data from the Internet</b>, which can greatly improve the GPS startup performance.</string>
 </resources>

res/values-en-rIN/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Just a sec\u2026</string>
     <string name="setup_complete">Setup is complete</string>
     <string name="setup_welcome">Welcome</string>
+    <string name="setup_welcome_message">Welcome to <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Language</string>
     <string name="setup_wifi">Select Wi-Fi</string>
     <string name="setup_sim_missing">SIM card missing</string>
@@ -39,9 +40,6 @@
     <string name="choose_data_sim_summary" product="tablet">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your tablet.</string>
     <string name="choose_data_sim_summary" product="default">Which SIM do you want to use for data? The selected SIM may incur network charges as it will be used to set up your phone.</string>
     <string name="date_time_summary">Set your time zone and adjust current date and time if needed</string>
-    <string name="backup_data_summary"><b>Back up</b> app data, Wi-Fi passwords, and other settings to Google servers</string>
-    <string name="other_services_summary">These services put Google to work for you, and you can turn them on or off at any time. Data will be used in accordance with Google\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Location services allows system and third party apps to gather and use data such as your approximate location. For example, an app may use your approximate location to locate nearby coffee shops.</string>
     <string name="location_access_summary"><b>Allow apps that have asked your permission</b> to use your location information. This may include your current location and past locations.</string>
     <string name="setup_mobile_data">Turn on cellular data</string>
     <string name="setup_mobile_data_no_service">No service</string>
@@ -51,29 +49,45 @@
     <string name="yes">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">Emergency call</string>
+    <string name="accessibility_settings">Accessibility settings</string>
     <string name="setup_services">LineageOS features</string>
-    <string name="services_explanation" product="tablet">These services work for you to extend the capabilities of your tablet. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_explanation" product="default">These services work for you to extend the capabilities of your phone. Data will be used in accordance with LineageOS\'s <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="services_privacy_policy">Privacy Policy</string>
+    <string name="services_pp_explanation">These services work for you to extend the capabilities of your device. Data will be used in accordance with <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s privacy policy.</string>
+    <string name="services_find_privacy_policy">You can read the privacy policy on another device by visiting <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Help improve <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> by automatically sending diagnostic and usage data to LineageOS. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%2$s</xliff:g> features.</string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> by automatically sending diagnostic and usage data to <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. This information can’t be used to identify you and lends a hand to teams working on things like battery life, app performance, and new <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
     <string name="services_os_nav_keys_label"><b>Use on screen navigation keys</b> instead of hardware keys.</string>
-    <string name="setup_unlock">Unlock</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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>
-    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</string>
     <string name="lockscreen_setup_title" product="default">Protect your phone</string>
+    <string name="lockscreen_setup_title" product="device">Protect your device</string>
+    <string name="lockscreen_setup_title" product="tablet">Protect your tablet</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">If you have a backup from your last <xliff:g id="name" example="LineageOS">%s</xliff:g> device, you can restore it here.</string>
+    <string name="intro_restore_button">Restore from backup</string>
+    <string name="update_recovery_title">Update Lineage Recovery</string>
+    <string name="update_recovery_description">Updates Lineage Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_warning">Recovery will be updated as soon as you finish the setup. If you wish to keep it intact, disable this feature.</string>
+    <string name="update_recovery_setting">Update Lineage Recovery alongside the OS</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navigation</string>
+    <string name="navigation_summary">Choose preferred navigation method</string>
+    <string name="gesture_navigation">Gesture navigation</string>
+    <string name="two_button_navigation">2-button navigation</string>
+    <string name="navbar_navigation">3-button navigation</string>
+    <string name="hide_gesture_hint">Hide gestural navigation hint</string>
+    <string name="location_agps_access_summary">When location is on, <b>download satellite assistance data from the internet</b>, which can greatly improve the GPS startup performance.</string>
 </resources>

res/values-eo/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.

res/values-es-rMX/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.

res/values-es-rUS/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -39,9 +39,6 @@
     <string name="choose_data_sim_summary" product="tablet">¿Qué tarjeta SIM quieres utilizar para los datos? La tarjeta SIM seleccionada puede incurrir en cargos de red ya que se utilizará para configurar la tableta.</string>
     <string name="choose_data_sim_summary" product="default">¿Qué tarjeta SIM quieres utilizar para los datos? La tarjeta SIM seleccionada puede incurrir en cargos de red ya que se utilizará para configurar el teléfono.</string>
     <string name="date_time_summary">Configurar la zona horaria y ajustar la fecha y hora actuales si es necesario</string>
-    <string name="backup_data_summary"><b>Copia de seguridad</b> de los datos de la 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 trabaje 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 ubicación permiten al sistema y a otras aplicaciones recopilar y utilizar datos tales como la ubicación aproximada. Por ejemplo, una aplicación puede utilizar la ubicación aproximada para localizar cafeterías cercanas.</string>
     <string name="location_access_summary"><b>Permitir aplicaciones que han solicitado el permiso</b> para usar la información de ubicación. Esto puede incluir la ubicación actual y otras ubicaciones recientes.</string>
     <string name="setup_mobile_data">Activar datos móviles</string>
     <string name="setup_mobile_data_no_service">Sin servicio</string>
@@ -51,27 +48,23 @@
     <string name="yes">Sí</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 de la tableta. Se utilizarán datos de acuerdo con las <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo con las <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_privacy_policy">Política de privacidad</string>
     <string name="services_help_improve_cm">Ayuda a mejorar <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> enviando automáticamente diagnósticos y uso de datos a LineageOS. Esta información no se utilizará para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características de <xliff:g id="name" example="LineageOS">%2$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
-    <string name="setup_unlock">Desbloquear</string>
-    <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="default">Protege el teléfono</string>
+    <string name="lockscreen_setup_title" product="tablet">Protege tu tableta</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>

res/values-es/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,6 +25,7 @@
     <string name="loading">Un segundo\u2026</string>
     <string name="setup_complete">Configuración completada</string>
     <string name="setup_welcome">¡Bienvenido/a!</string>
+    <string name="setup_welcome_message">Bienvenido a <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="setup_locale">Idioma</string>
     <string name="setup_wifi">Selecciona una red Wi-Fi</string>
     <string name="setup_sim_missing">Falta la tarjeta SIM</string>
@@ -39,39 +40,54 @@
     <string name="choose_data_sim_summary" product="tablet">¿Qué tarjeta SIM quieres utilizar para los datos? La tarjeta SIM seleccionada puede incurrir en cargos de red ya que se utilizará para configurar el tablet.</string>
     <string name="choose_data_sim_summary" product="default">¿Qué tarjeta SIM quieres utilizar para los datos? La tarjeta SIM seleccionada puede incurrir en cargos de red ya que se utilizará para configurar el teléfono.</string>
     <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_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="accessibility_settings">Ajustes de accesibilidad</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>
-    <string name="services_explanation" product="default">Estos servicios sirven para extender las capacidades del teléfono. Se utilizarán datos de acuerdo a la <xliff:g id="name" example="Privacy Policy">%s</xliff:g> de LineageOS.</string>
-    <string name="services_privacy_policy">Política de Privacidad</string>
+    <string name="services_pp_explanation">Estos servicios sirven para extender las capacidades de tu dispositivo. Los datos se utilizarán de acuerdo a la política de privacidad de <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">Puedes leer la política de privacidad en otro dispositivo visitando <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
     <string name="services_help_improve_cm">Ayuda a mejorar <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> enviando automáticamente diagnósticos y uso de datos a LineageOS. Esta información no se utilizará para identificarte y sirve para mejorar la vida útil de la batería, el rendimiento de la aplicación y el desarrollo de nuevas características de <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> enviando automáticamente datos de diagnóstico y uso a <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Esta información no puede usarse para identificarte y ayuda a los equipos que trabajan en aspectos como la duración de la batería, el rendimiento de la aplicación y las nuevas funciones de <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
     <string name="services_os_nav_keys_label"><b>Usar las teclas de navegación en pantalla</b> en vez de las teclas físicas.</string>
-    <string name="setup_unlock">Desbloquear</string>
-    <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="services_full_description"><xliff:g id="pp_explanation">%1$s</xliff:g>\n<xliff:g id="pp_find">%2$s</xliff:g></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_title" product="device">Protege tu dispositivo</string>
+    <string name="lockscreen_setup_title" product="tablet">Protege tu tableta</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">Si tienes una copia de seguridad de tu último dispositivo <xliff:g id="name" example="LineageOS">%s</xliff:g> , puedes restaurarla aquí.</string>
+    <string name="intro_restore_button">Restaurar desde copia de seguridad</string>
+    <string name="update_recovery_title">Actualizar el modo de recuperación de Lineage</string>
+    <string name="update_recovery_description">Actualiza el modo de recuperación de Lineage en el primer arranque posterior a cada actualización.</string>
+    <string name="update_recovery_warning">El modo de recuperación se actualizará tan pronto como finalice la configuración. Si deseas mantenerlo intacto, desactiva esta función.</string>
+    <string name="update_recovery_setting">Actualizar el modo de recuperación de Lineage junto con el sistema operativo</string>
+    <string name="update_recovery_full_description"><xliff:g id="recovery_update_description">%1$s</xliff:g>\n<xliff:g id="recovery_update_warning">%2$s</xliff:g></string>
+    <string name="setup_navigation">Navegación</string>
+    <string name="navigation_summary">Elegir método de navegación preferido</string>
+    <string name="gesture_navigation">Navegación por gestos</string>
+    <string name="two_button_navigation">Navegación con dos botones</string>
+    <string name="navbar_navigation">Navegación con tres botones</string>
+    <string name="hide_gesture_hint">Ocultar la ayuda de navegación por gestos.</string>
+    <string name="location_agps_access_summary">Cuando la ubicación está activada en <b>Descargar datos de asistencia por satélite de Internet</b>, puede mejorar en gran medida el rendimiento de arranque del GPS.</string>
 </resources>

res/values-et/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -37,9 +37,6 @@
     <string name="choose_data_sim_summary" product="tablet">Millist SIM-kaarti soovid andmeside kasutamiseks? Valitud SIM-ga võivad kaasneda võrgutasud, kuna seda kasutatakse tahvelarvuti seadistamiseks.</string>
     <string name="choose_data_sim_summary" product="default">Millist SIM-kaarti soovid andmeside kasutamiseks? Valitud SIM-ga võivad kaasneda võrgutasud, kuna seda kasutatakse nutitelefoni seadistamiseks.</string>
     <string name="date_time_summary">Määra ajavöönd ning kohandada vajadusel tänast kuupäeva ja kellaaega</string>
-    <string name="backup_data_summary"><b>Varunda</b> rakeduste andmeid, Wi-Fi salasõnasid ning muid sätteid Google serveritesse</string>
-    <string name="other_services_summary">Need teenused panevad Google sinu heaks tööle ning sul on võimalus neid sätteid igal ajal sisse või välja lülitada. Andmeid kasutatakse vastavalt Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g>.</string>
-    <string name="location_services_summary">Asukohateenused võimaldavad süsteemil ja kolmandate osapoolte rakendustel koguda ja kasutada informatsiooni sinu umbkaudse asukoha kohta. Näiteks võib rakendus kasutada sinu umbkaudset asukohta, et leida lähedal asuvaid kohvikuid.</string>
     <string name="location_access_summary"><b>Luba rakendustel, mis on küsinud Teie nõusolekut</b> kasutada Teie asukoha informatsiooni. See võib tähendada nii Teie praegust kui ka eelnevaid asukohti.</string>
     <string name="setup_mobile_data_no_service">Teenus puudub</string>
     <string name="setup_mobile_data_emergency_only">Üksnes hädaabikõned</string>
@@ -47,19 +44,21 @@
     <string name="yes">Jah</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ädaabinumbril helistamine</string>
-    <string name="services_privacy_policy">Privaatsuspoliitika</string>
     <string name="services_help_improve_cm">Aita parendada <xliff:g id="name" example="LineageOS">%s</xliff:g>i</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> saates meile automatselt diagnostikat ja kasutusandmeid. Seda teavet ei saa kasutada sinu tuvastamiseks ning see aitab arendajatel muuhulgas parandada aku eluiga, rakenduste jõudlust ning arendada uusi <xliff:g id="name" example="LineageOS">%2$s</xliff:g>i võimalusi.</string>
     <string name="services_os_nav_keys_label"><b>Kasuta ekraanil olevaid navigeerimisklahve</b> riistvaraliste nuppude asemel.</string>
-    <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_button">Taasta varundusest</string>
+    <string name="update_recovery_title">Uuenda Lineage Recoveryt</string>
+    <string name="update_recovery_setting">Uuenda Lineage Recoveryt koos OSiga</string>
 </resources>

res/values-eu/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -39,9 +39,6 @@
     <string name="choose_data_sim_summary" product="tablet">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure tableta ezartzeko erabiliko baita.</string>
     <string name="choose_data_sim_summary" product="default">Zein SIM erabili nahi duzu datu mugikorretarako? Hautatutako SIM txartelean gastuak sor litzake zure telefonoa ezartzeko erabiliko baita.</string>
     <string name="date_time_summary">Ezarri zure ordu-zona eta doitu oraingo data beharrezkoa bada</string>
-    <string name="backup_data_summary">Aplikazio datuen, Wi-Fi pasahitzen, eta bestelako ezarpenen <b>babeskopia</b> egin Google zerbitzarietan</string>
-    <string name="other_services_summary">Zerbitzu hauek Google zure mesedetan lanean jartzen dute, edozein unetan piztu edo itzali ditzakezu. Datuak Google <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
-    <string name="location_services_summary">Kokaleku zerbitzuek zure kokalekua bezalako datuak eskuratzea ahalbidetzen diete sistemako eta instalatutako aplikazioei. Adibidez, aplikazio batek zure kokalekua erabili lezake inguruko kafetegiak aurkitzeko.</string>
     <string name="location_access_summary"><b>Baimena eskatu dizuten aplikazioei</b> zure kokaleku informazioa erabiltzea ahalbidetu. Uneko zein iraganeko kokalekuak barne.</string>
     <string name="setup_mobile_data">Piztu datu mugikorrak</string>
     <string name="setup_mobile_data_no_service">Zerbitzurik ez</string>
@@ -51,23 +48,15 @@
     <string name="yes">Bai</string>
     <string name="emergency_call">Larrialdi deia</string>
     <string name="setup_services">LineageOS ezaugarriak</string>
-    <string name="services_explanation" product="tablet">Zerbitzu hauek tabletaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak LineageOS <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
-    <string name="services_explanation" product="default">Zerbitzu hauek telefonoaren gaitasunak hobetzeko zure mesedetan egiten dute lan. Datuak LineageOSen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> arabera erabiliko dira.</string>
-    <string name="services_privacy_policy">Pribatutasun politika</string>
     <string name="services_help_improve_cm">Lagundu <xliff:g id="name" example="LineageOS">%s</xliff:g> hobetzen</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> automatikoki diagnostiko eta erabilera datuak bidaliz LineageOS-i. Informazio hau ezin da erabili zu identifikatzeko eta bateriaren iraupenean, aplikazioen errendimenduan, eta <xliff:g id="name" example="LineageOS">%2$s</xliff:g>-en ezaugarri berrietan lanean dabilen taldearentzat lagungarria da.</string>
     <string name="services_os_nav_keys_label"><b>Erabili pantailako nabigazio teklak</b> hardware teklen ordez.</string>
-    <string name="setup_unlock">Desblokeatu</string>
-    <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>

res/values-fa/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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,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>
@@ -37,9 +34,6 @@
     <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_no_service">بدون سرویس</string>
     <string name="setup_mobile_data_emergency_only">فقط تماس اضطراری</string>
@@ -47,18 +41,14 @@
     <string name="yes">بله</string>
     <string name="emergency_call">تماس اضطراری</string>
     <string name="setup_services">ویژگی‌های لینیِج اواِس</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="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>

res/values-fi/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
-     Copyright (C) 2017-2020 The LineageOS Project
+     Copyright (C) 2017-2020, 2022 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.
@@ -39,9 +39,6 @@
     <string name="choose_data_sim_summary" product="tablet">Mitä SIM-korttia haluat käyttää mobiilitiedonsiirtoon? Mobiilidatan käyttö voi aiheuttaa tiedonsiirtokuluja.</string>
     <string name="choose_data_sim_summary" product="default">Mitä SIM-korttia haluat käyttää mobiilitiedonsiirtoon? Mobiilidatan käyttö voi aiheuttaa tiedonsiirtokuluja.</string>
     <string name="date_time_summary">Valitse aikavyöhyke ja määritä aika ja päivämäärä tarvittaessa</string>
-    <string name="backup_data_summary"><b>Varmuuskopioi</b> sovellusten tiedot, Wi-FI-salasanat ja muut asetukset Googlen palvelimille</string>
-    <string name="other_services_summary">Tämä ottaa Googlen palvelut käyttöön, ja voit ottaa ne käyttöön tai poistaa käytöstä milloin tahansa. Tietoja käytetään Googlen <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
-    <string name="location_services_summary">Sijaintipalvelut sallii järjestelmän ja muiden sovellusten kerätä ja käyttää tietoja kuten likimääräinen sijaintisi. Esimerkiksi sovellus voi paikantaa sinut ja etsiä lähistöllä olevia kahviloita.</string>
     <string name="location_access_summary"><b>Salli sovellusten, jotka ovat kysyneet sinulta lupaa</b> käyttää sijaintitietojasi. Tämä saattaa sisältää nykyisen sijaintisi ja aiemmat sijaintisi.</string>
     <string name="setup_mobile_data">Ota mobiilidata käyttöön</string>
     <string name="setup_mobile_data_no_service">Ei palvelua</string>
@@ -49,29 +46,34 @@
     <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>
-    <string name="services_explanation" product="default">Nämä palvelut toimivat puhelimesi ominaisuuksien parantamiseksi. Tietoja käytetään LineageOS:n <xliff:g id="name" example="Privacy Policy">%s</xliff:g> mukaisesti.</string>
-    <string name="services_privacy_policy">Tietosuojakäytännön</string>
     <string name="services_help_improve_cm">Auta parantamaan <xliff:g id="name" example="LineageOS">%s</xliff:g>ia</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> lähettämällä vianmääritys- ja käyttötietoja LineageOS:lle. Tietoja ei voi käyttää tunnistamiseen. Tiedot auttavat kehittäjiä muun muassa parantamaan akun kestoa, sovellusten suorituskykyä ja kehittämään <xliff:g id="name" example="LineageOS">%2$s</xliff:g>:iin uusia ominaisuuksia.</string>
     <string name="services_os_nav_keys_label"><b>Käytä näytön navigointipalkkia</b> fyysisten näppäinten sijaan.</string>
-    <string name="setup_unlock">Avaa lukitus</string>
-    <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="default">Suojaa puhelintasi</string>
+    <string name="lockscreen_setup_title" product="device">Suojaa laitteesi</string>
+    <string name="lockscreen_setup_title" product="tablet">Suojaa tablettisi</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">Jos sinulla on varmuuskopio edellisestä <xliff:g id="name" example="LineageOS">%s</xliff:g>-laitteestasi, voit palauttaa sen tästä.</string>
+    <string name="intro_restore_button">Palauta varmuuskopiosta</string>
+    <string name="update_recovery_title">Päivitä Lineage Recovery</string>
+    <string name="update_recovery_description">Päivittää Lineage Recoveryn jokaisen päivityksen jälkeen ensimmäisellä käynnistyskerralla</string>
+    <string name="update_recovery_warning">Recovery pävitetään kun asennus on valmis. Jos haluat säilyttää sen ennallaan, poista tämä ominaisuus käytöstä.</string>
+    <string name="update_recovery_setting">Päivitä Lineage Recovery käyttöjärjestelmän rinnalla</string>
 </resources>