From d3c71c2594dcb0339bc0c202a3090a29d2a20818 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 28 Sep 2023 18:10:22 +0530
Subject: [PATCH 1/2] Move our string modifications to e_strings.xml

---
 res/values-de/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-es/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-fr/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-is/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-it/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-nl/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-ru/e_strings.xml | 28 ++++++++++++++++++++++++++++
 res/values-sv/e_strings.xml | 19 +++++++++++++++++++
 res/values/e_strings.xml    | 30 ++++++++++++++++++++++++++++++
 9 files changed, 245 insertions(+)
 create mode 100644 res/values-de/e_strings.xml
 create mode 100644 res/values-es/e_strings.xml
 create mode 100644 res/values-fr/e_strings.xml
 create mode 100644 res/values-is/e_strings.xml
 create mode 100644 res/values-it/e_strings.xml
 create mode 100644 res/values-nl/e_strings.xml
 create mode 100644 res/values-ru/e_strings.xml
 create mode 100644 res/values-sv/e_strings.xml
 create mode 100644 res/values/e_strings.xml

diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml
new file mode 100644
index 00000000..9f94407c
--- /dev/null
+++ b/res/values-de/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="update_recovery_setting_e">Aktualisiert das Recovery mit dem OS</string>
+    <string name="update_recovery_description_e">Aktualisiert das Recovery beim ersten Booten nach jeder Aktualisierung.</string>
+    <string name="update_recovery_title_e">Recovery aktualisieren</string>
+    <string name="setup_welcome_message_e">Willkommen bei
+\n/e/OS</string>
+    <string name="sign_in">Anmelden</string>
+    <string name="create_account">Konto erstellen</string>
+    <string name="e_account_manager_setup_configure">Anmelden</string>
+    <string name="e_account_manager_setup_summary">Melde dich mit deiner e.email oder murena.io ID an, um dein persönliches Konto mit diesem Telefon zu verknüpfen. Dies wird die Synchronisation von E-Mails, Kontakten, Kalenderereignissen, Bilder, Videos, Notizen und Aufgaben zwischen diesem Telefon und deiner persönlichen Cloud ermöglichen.</string>
+    <string name="e_account_manager_setup_title">Synchronisiere dein Cloud-Konto</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-es/e_strings.xml b/res/values-es/e_strings.xml
new file mode 100644
index 00000000..23528566
--- /dev/null
+++ b/res/values-es/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_welcome_message_e">Bienvenido a
+\n/e/OS</string>
+    <string name="sign_in">Acceder</string>
+    <string name="create_account">Crear Cuenta</string>
+    <string name="update_recovery_setting_e">Actualizar Recovery junto con el sistema operativo</string>
+    <string name="update_recovery_description_e">Actualiza Recovery en el primer arranque posterior a cada actualización.</string>
+    <string name="update_recovery_title_e">Actualizar Recovery</string>
+    <string name="e_account_manager_setup_configure">Iniciar sesión</string>
+    <string name="e_account_manager_setup_summary">Inicia sesión con tu ID de e.email o murena.io para conectar tu cuenta personal con este teléfono. Esto te permitirá sincronizar tus correos electrónicos, contactos, eventos del calendario, imágenes, vídeos, notas y tareas entre este teléfono y tu nube personal.</string>
+    <string name="e_account_manager_setup_title">Sincroniza tu cuenta en la nube</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml
new file mode 100644
index 00000000..5ccf27d0
--- /dev/null
+++ b/res/values-fr/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="setup_welcome_message_e">Bienvenue sur
+\n/e/OS</string>
+    <string name="sign_in">Se connecter</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="e_account_manager_setup_configure">Se connecter</string>
+    <string name="e_account_manager_setup_summary">Identifiez-vous avec votre identifiant e.email ou murena.io pour connecter votre compte personnel avec ce téléphone. Cela activera la synchronisation de vos e-mails, contacts, événements de calendriers, images, vidéos, notes et tâches entre ce téléphone et votre cloud personnel.</string>
+    <string name="e_account_manager_setup_title">Synchronisez votre compte cloud</string>
+    <string name="update_recovery_setting_e">Mettre à jour le Recovery en même temps que l\'OS</string>
+    <string name="update_recovery_description_e">Met à jour le Recovery lors du premier démarrage suivant chaque mise à jour.</string>
+    <string name="update_recovery_title_e">Mettre à jour le Recovery</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-is/e_strings.xml b/res/values-is/e_strings.xml
new file mode 100644
index 00000000..4d6e2a58
--- /dev/null
+++ b/res/values-is/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_account_manager_setup_title">Samstilltu skýjaaðganginn þinn</string>
+    <string name="e_account_manager_setup_summary">Skráðu inn með e.email eða murena.io auðkenni til að tengjast persónulegum aðgangi þínum á þessum síma. Þetta mun samstilla tölvupóstana þína, tengiliði, dagatalsatburði, myndir, myndskeið, glósur og verkefni á milli símans og persónulega tölvuskýsins þíns.</string>
+    <string name="e_account_manager_setup_configure">Skrá inn</string>
+    <string name="create_account">Búa til aðgang</string>
+    <string name="sign_in">Skrá inn</string>
+    <string name="setup_welcome_message_e">Velkomin í
+\n/e/OS</string>
+    <string name="update_recovery_title_e">Uppfæra endurheimtingu</string>
+    <string name="update_recovery_description_e">Uppfærir endurheimtingardiskmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
+    <string name="update_recovery_setting_e">Uppfæra endurheimtingu samhliða uppfærslum stýrikerfis</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml
new file mode 100644
index 00000000..84aba860
--- /dev/null
+++ b/res/values-it/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_account_manager_setup_configure">Accedi</string>
+    <string name="e_account_manager_setup_summary">Accedi con il tuo ID e.email o murena.io per collegare l\'account a questo telefono. In questo modo sarà possibile sincronizzare email, contatti, eventi del calendario, immagini, video, note e attività tra questo telefono e il proprio cloud.</string>
+    <string name="e_account_manager_setup_title">Sincronizza l\'account cloud</string>
+    <string name="update_recovery_setting_e">Aggiorna la Recovery insieme al SO</string>
+    <string name="update_recovery_description_e">Aggiorna la Recovery al primo riavvio sucessivo ad ogni aggiornamento.</string>
+    <string name="update_recovery_title_e">Aggiorna Recovery</string>
+    <string name="setup_welcome_message_e">Benvenuto a
+\n/e/OS</string>
+    <string name="sign_in">Accedi</string>
+    <string name="create_account">Crea Account</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-nl/e_strings.xml b/res/values-nl/e_strings.xml
new file mode 100644
index 00000000..9d753512
--- /dev/null
+++ b/res/values-nl/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="sign_in">Inloggen</string>
+    <string name="update_recovery_setting_e">Werk Herstel bij samen met het OS</string>
+    <string name="update_recovery_description_e">Werkt Herstel bij tijdens de eerste opstart na elke update.</string>
+    <string name="update_recovery_title_e">Herstel bijwerken</string>
+    <string name="setup_welcome_message_e">Welkom bij
+\n/e/OS</string>
+    <string name="create_account">Account aanmaken</string>
+    <string name="e_account_manager_setup_configure">Inloggen</string>
+    <string name="e_account_manager_setup_summary">Log in met je e.email of murena.io ID om jouw persoonlijk account te verbinden met deze telefoon. Dit zal synchronisatie inschakelen voor e-mails, contacten, agenda items, afbeeldingen, video\'s, notities en taken tussen deze telefoon en je persoonlijke cloud.</string>
+    <string name="e_account_manager_setup_title">Synchroniseer jouw cloud account</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/e_strings.xml b/res/values-ru/e_strings.xml
new file mode 100644
index 00000000..1c341355
--- /dev/null
+++ b/res/values-ru/e_strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="update_recovery_setting_e">Обновление Recovery наряду с ОС</string>
+    <string name="update_recovery_description_e">Обновляет Recovery при первой загрузке после каждого обновления.</string>
+    <string name="update_recovery_title_e">Обновление Recovery</string>
+    <string name="setup_welcome_message_e">Добро пожаловать
+\nв /e/OS</string>
+    <string name="sign_in">Войти</string>
+    <string name="e_account_manager_setup_configure">Войти</string>
+    <string name="e_account_manager_setup_summary">Войдите в систему с помощью e.email или murena.io ID , чтобы подключить свою личную учётную запись к этому телефону. Это позволит синхронизировать электронную почту, контакты, события календаря, изображения, видео, заметки и задачи между этим телефоном и вашим личным облаком.</string>
+    <string name="e_account_manager_setup_title">Синхронизируйте свою облачную учётную запись</string>
+    <string name="create_account">Создать учётную запись</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-sv/e_strings.xml b/res/values-sv/e_strings.xml
new file mode 100644
index 00000000..ff931f8f
--- /dev/null
+++ b/res/values-sv/e_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="create_account">Skapa konto</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml
new file mode 100644
index 00000000..c3aacd8e
--- /dev/null
+++ b/res/values/e_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright Murena SAS 2023
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="e_account_manager_setup_title">Sync your cloud account</string>
+    <string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
+    <string name="e_account_manager_setup_configure">Log in</string>
+
+    <string name="create_account">Create Account</string>
+    <string name="sign_in">Sign in</string>
+
+    <string name="setup_welcome_message_e">Welcome to \n/e/OS</string>
+
+    <string name="update_recovery_title_e">Update Recovery</string>
+    <string name="update_recovery_description_e">Updates Recovery on first boot subsequent to every update.</string>
+    <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
+</resources>
\ No newline at end of file
-- 
GitLab


From c64e28adb57c51abed9aa6a2c62228f012b889ba Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Thu, 28 Sep 2023 18:13:07 +0530
Subject: [PATCH 2/2] Make strings.xml and cm_strings.xml same as upstream so
 as to avoid conflicts when merging upstream changes

---
 res/values-de/strings.xml | 15 ++------
 res/values-es/strings.xml | 35 ++---------------
 res/values-fi/strings.xml |  5 ++-
 res/values-fr/strings.xml | 26 ++++---------
 res/values-is/strings.xml | 80 +++++++++++++++++----------------------
 res/values-it/strings.xml | 15 ++------
 res/values-nb/strings.xml |  7 ++--
 res/values-nl/strings.xml | 21 +++-------
 res/values-ru/strings.xml | 17 ++-------
 res/values-sv/strings.xml |  4 +-
 res/values/strings.xml    | 15 --------
 11 files changed, 70 insertions(+), 170 deletions(-)

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d4ddb2fa..b1ad0a76 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Einrichtungsassistent</string>
     <string name="next">Weiter</string>
     <string name="skip">Überspringen</string>
@@ -88,14 +89,4 @@
     <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="update_recovery_setting_e">Aktualisiert das Recovery mit dem OS</string>
-    <string name="update_recovery_description_e">Aktualisiert das Recovery beim ersten Booten nach jeder Aktualisierung.</string>
-    <string name="update_recovery_title_e">Recovery aktualisieren</string>
-    <string name="setup_welcome_message_e">Willkommen bei
-\n/e/OS</string>
-    <string name="sign_in">Anmelden</string>
-    <string name="create_account">Konto erstellen</string>
-    <string name="e_account_manager_setup_configure">Anmelden</string>
-    <string name="e_account_manager_setup_summary">Melde dich mit deiner e.email oder murena.io ID an, um dein persönliches Konto mit diesem Telefon zu verknüpfen. Dies wird die Synchronisation von E-Mails, Kontakten, Kalenderereignissen, Bilder, Videos, Notizen und Aufgaben zwischen diesem Telefon und deiner persönlichen Cloud ermöglichen.</string>
-    <string name="e_account_manager_setup_title">Synchronisiere dein Cloud-Konto</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index da3b6183..22333e61 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Asistente de configuración</string>
     <string name="next">Siguiente</string>
     <string name="skip">Omitir</string>
@@ -68,34 +69,4 @@
     <string name="lockscreen_setup_screen_lock_setup">Configurar</string>
     <string name="intro_restore_title">Restaurar aplicaciones y datos</string>
     <string name="intro_restore_button">Restaurar desde copia de seguridad</string>
-    <string name="setup_welcome_message_e">Bienvenido a
-\n/e/OS</string>
-    <string name="hide_gesture_hint">Ocultar sugerencia de navegación por gestos</string>
-    <string name="navbar_navigation">Navegación con 3 botones</string>
-    <string name="two_button_navigation">Navegación con 2 botones</string>
-    <string name="gesture_navigation">Navegación por gestos</string>
-    <string name="navigation_summary">Elija el método de navegación preferido</string>
-    <string name="setup_navigation">Navegación</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="intro_restore_subtitle" product="default">Si tiene una copia de seguridad de su último <xliff:g id="name" example="LineageOS">%s</xliff:g> teléfono, puede restaurarlo aquí.</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="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> mediante el envío automático de datos de diagnóstico y uso a <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Esta información no se puede utilizar para identificarle y ayuda a los equipos que trabajan en aspectos como la duración de la batería, el rendimiento de las aplicaciones y las nuevas tecnologías. <xliff:g id="name" example="LineageOS">%3$s</xliff:g> características.</string>
-    <string name="setup_welcome_message">Bienvenido a <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
-    <string name="sign_in">Acceder</string>
-    <string name="create_account">Crear Cuenta</string>
-    <string name="update_recovery_setting_e">Actualizar Recovery junto con el sistema operativo</string>
-    <string name="update_recovery_description_e">Actualiza Recovery en el primer arranque posterior a cada actualización.</string>
-    <string name="update_recovery_title_e">Actualizar Recovery</string>
-    <string name="e_account_manager_setup_configure">Iniciar sesión</string>
-    <string name="e_account_manager_setup_summary">Inicia sesión con tu ID de e.email o murena.io para conectar tu cuenta personal con este teléfono. Esto te permitirá sincronizar tus correos electrónicos, contactos, eventos del calendario, imágenes, vídeos, notas y tareas entre este teléfono y tu nube personal.</string>
-    <string name="e_account_manager_setup_title">Sincroniza tu cuenta en la nube</string>
-    <string name="update_recovery_setting">Actualizar Lineage Recovery junto con el sistema operativo</string>
-    <string name="update_recovery_warning">La recuperación se actualizará en cuanto termines la configuración. Si deseas mantenerlo intacto, desactiva esta función.</string>
-    <string name="update_recovery_description">Actualiza Lineage Recovery en el primer arranque posterior a cada actualización.</string>
-    <string name="update_recovery_title">Actualizar Lineage Recovery</string>
-    <string name="services_find_privacy_policy">Puede 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_pp_explanation">Estos servicios trabajan para usted para ampliar las capacidades de su dispositivo. Los datos se utilizarán de acuerdo con <xliff:g id="name" example="LineageOS">%1$s</xliff:g>\'s política de privacidad.</string>
-    <string name="accessibility_settings">Ajustes de accesibilidad</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 119222bd..c511a36e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Ohjattu asennus</string>
     <string name="next">Seuraava</string>
     <string name="skip">Ohita</string>
@@ -73,4 +74,4 @@
     <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>
\ No newline at end of file
+</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2453d187..1600856a 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistant de configuration</string>
     <string name="next">Suivant</string>
     <string name="skip">Ignorer</string>
@@ -81,22 +82,11 @@
     <string name="update_recovery_description">Met à jour Lineage Recovery au premier démarrage après chaque mise à jour.</string>
     <string name="update_recovery_warning">La récupération sera mise à jour dès que vous aurez terminé la configuration. Si vous souhaitez la garder intacte, veuillez désactiver cette fonctionnalité.</string>
     <string name="update_recovery_setting">Mettre à jour Lineage Recovery en même temps que le système d\'exploitation</string>
-    <string name="setup_welcome_message_e">Bienvenue sur
-\n/e/OS</string>
-    <string name="sign_in">Se connecter</string>
-    <string name="create_account">Créer un compte</string>
-    <string name="e_account_manager_setup_configure">Se connecter</string>
-    <string name="e_account_manager_setup_summary">Identifiez-vous avec votre identifiant e.email ou murena.io pour connecter votre compte personnel avec ce téléphone. Cela activera la synchronisation de vos e-mails, contacts, événements de calendriers, images, vidéos, notes et tâches entre ce téléphone et votre cloud personnel.</string>
-    <string name="e_account_manager_setup_title">Synchronisez votre compte cloud</string>
-    <string name="hide_gesture_hint">Masquer les astuces de navigation par gestes</string>
-    <string name="navbar_navigation">Navigation à 3 boutons</string>
-    <string name="two_button_navigation">Navigation à 2 boutons</string>
-    <string name="gesture_navigation">Navigation par gestes</string>
-    <string name="navigation_summary">Choisissez votre mode de navigation préféré</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="update_recovery_setting_e">Mettre à jour le Recovery en même temps que l\'OS</string>
-    <string name="update_recovery_description_e">Met à jour le Recovery lors du premier démarrage suivant chaque mise à jour.</string>
-    <string name="update_recovery_title_e">Mettre à jour le 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="navigation_summary">Choisir la méthode de navigation préférée</string>
+    <string name="gesture_navigation">Navigation gestuelle</string>
+    <string name="two_button_navigation">Navigation à deux boutons</string>
+    <string name="navbar_navigation">Navigation à trois boutons</string>
+    <string name="hide_gesture_hint">Cacher l\'indice de navigation gestuelle</string>
 </resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 456e4f3d..390b76b5 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -14,90 +14,78 @@
      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="setup_mobile_data">Kveiktu á farsímagögnum</string>
-    <string name="services_os_nav_keys_label"><b>Nota leiðsagnarlykla á skjánum</b> í stað vélbúnaðarhnappa.</string>
-    <string name="sign_in">Skrá inn</string>
-    <string name="done">Lokið</string>
-    <string name="ok">Í lagi</string>
-    <string name="yes">Já</string>
-    <string name="no">Nei</string>
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">Uppsetningarleiðarvísir</string>
     <string name="next">Næsta</string>
     <string name="skip">Sleppa</string>
-    <string name="setup_mobile_data_no_service">Engin þjónusta</string>
-    <string name="emergency_call">Neyðarsímtal</string>
-    <string name="accessibility_settings">Stillingar fyrir altækan aðgang</string>
-    <string name="services_pp_explanation">Þessar þjónustur gera þér kleift að útvíkka eiginleika tækisins þíns. Gögn verða notuð í samræmi við persónuverndarstefnu <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
-    <string name="services_find_privacy_policy">Lestu stefnu varðandi meðferð persónulegra gagna með því að fara á <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
-    <string name="update_recovery_title">Uppfæra endurheimtingu LineageOS</string>
-    <string name="e_account_manager_setup_configure">Skrá inn</string>
-    <string name="update_recovery_setting">Uppfæra endurheimtingu LineageOS samhliða uppfærslum stýrikerfis</string>
-    <string name="update_recovery_title_e">Uppfæra endurheimtingu</string>
-    <string name="update_recovery_setting_e">Uppfæra endurheimtingu samhliða uppfærslum stýrikerfis</string>
-    <string name="app_name">Uppsetningarleiðarvísir</string>
     <string name="start">Byrja</string>
-    <string name="loading">Hinkraðu við…</string>
+    <string name="done">Lokið</string>
+    <string name="ok">Í lagi</string>
+    <string name="loading">Bíddu aðeins\u2026</string>
     <string name="setup_complete">Uppsetningu er lokið</string>
     <string name="setup_welcome">Velkomin</string>
+    <string name="setup_welcome_message">Velkomin í <xliff:g id="name" example="LineageOS">%1s</xliff:g></string>
     <string name="setup_locale">Tungumál</string>
     <string name="setup_wifi">Veldu Wi-Fi-net</string>
-    <string name="setup_sim_missing">SIM-kort vantar</string>
+    <string name="setup_sim_missing">SIM-kortið vantar</string>
     <string name="setup_choose_data_sim">Veldu SIM-kort undir gögn</string>
     <string name="setup_location">Staðsetningarþjónustur</string>
     <string name="setup_other">Aðrar þjónustur</string>
-    <string name="setup_datetime">Dagsetning &amp; tími</string>
+    <string name="setup_datetime">Dagsetning og tími</string>
     <string name="setup_current_date">Núverandi dagsetning</string>
     <string name="setup_current_time">Núverandi tími</string>
     <string name="sim_missing_summary" product="tablet">SIM-kort fannst ekki í spjaldtölvunni þinni. Til að setja inn SIM-kort skaltu lesa leiðbeiningarnar sem komu með tækinu þínu.</string>
     <string name="sim_missing_summary" product="default">SIM-kort fannst ekki í símanum þínum. Til að setja inn SIM-kort skaltu lesa leiðbeiningarnar sem komu með tækinu þínu.</string>
-    <string name="face_setup_title">Uppsetning andlitskennsla</string>
-    <string name="services_help_improve_cm">Hjálpaðu okkur að bæta <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
-    <string name="fingerprint_setup_add_fingerprint">Bæta við fingrafarinu þínu</string>
-    <string name="enable_mobile_data_summary">Viltu nota farsímagögn á meðan uppsetningu stendur\? Sé kveikt á farsímagögnum getur það haft aukakostnað í för með sér.</string>
-    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
-    <string name="setup_services">LineageOS eiginleikar</string>
     <string name="choose_data_sim_summary" product="tablet">Hvaða SIM-kort viltu nota undir gögn? Valda SIM-kortið gæti valdið útgjöldum vegna netsambands þar sem það verður notað til að setja upp spjaldtölvuna þína.</string>
     <string name="choose_data_sim_summary" product="default">Hvaða SIM-kort viltu nota undir gögn? Valda SIM-kortið gæti valdið útgjöldum vegna netsambands þar sem það verður notað til að setja upp símann þinn.</string>
     <string name="date_time_summary">Settu tímabeltið þitt og lagaðu núverandi dags- og tímasetningu ef þörf krefur</string>
     <string name="location_access_summary"><b>Leyfa forrit sem hafa beðið um heimild þína</b> til að nota staðsetningarupplýsingar. Þetta gæti falið í sér aðgang að upplýsingum um núverandi jafnt sem fyrri staðsetningar.</string>
+    <string name="setup_mobile_data">Kveiktu á farsímagögnum</string>
+    <string name="setup_mobile_data_no_service">Engin þjónusta</string>
     <string name="setup_mobile_data_emergency_only">Einungis neyðarsímtöl</string>
+    <string name="enable_mobile_data_summary">Viltu nota farsímagögn á meðan uppsetningu stendur? Sé kveikt á farsímagögnum getur það haft aukakostnað í för með sér.</string>
+    <string name="no">Nei</string>
+    <string name="yes">Já</string>
+    <string name="data_sim_name">SIM <xliff:g id="sub">%1$d</xliff:g> - <xliff:g id="name">%2$s</xliff:g></string>
+    <string name="emergency_call">Neyðarsímtal</string>
+    <string name="accessibility_settings">Stillingar fyrir altækan aðgang</string>
+    <string name="setup_services">Eiginleikar LineageOS</string>
+    <string name="services_pp_explanation">Þessar þjónustur gera þér kleift að útvíkka eiginleika tækisins þíns. Gögn verða notuð í samræmi við persónuverndarstefnu <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_find_privacy_policy">Lestu stefnu varðandi meðferð persónulegra gagna með því að fara á <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g></string>
+    <string name="services_help_improve_cm">Hjálpaðu okkur að bæta <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
+    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> með því að senda sjálfvirkt greiningargögn og upplýsingar um notkun til <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Þessar upplýsingar er ekki hægt að nota til að auðkenna þig og hjálpa þróunarteymum við vinnu varðandi ýmis atriði, eins og líftíma rafhlöðu, afköst forrita og nýja eiginleika í <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
+    <string name="services_os_nav_keys_label"><b>Nota leiðsagnarlykla á skjánum</b> í stað vélbúnaðarhnappa.</string>
     <string name="settings_biometric_setup_title">Veldu gerð skjálæsingar til vara</string>
-    <string name="settings_biometric_setup_details">Hvernig viltu læsa skjánum þínum\?</string>
-    <string name="fingerprint_setup_title">Uppsetningu fingrafars</string>
+    <string name="settings_biometric_setup_details">Hvernig viltu læsa skjánum þínum?</string>
+    <string name="fingerprint_setup_title">Uppsetning fingrafaraskanna</string>
     <string name="fingerprint_setup_summary">Til að nota fingrafaraskanna til að aflæsa skjánum, þarftu að:</string>
+    <string name="fingerprint_setup_add_fingerprint">Bættu við fingrafarinu þínu</string>
+    <string name="face_setup_title">Uppsetning andlitskennsla</string>
     <string name="face_setup_summary">Til að nota andlitaskanna til að aflæsa skjánum, þarftu að:</string>
     <string name="face_setup_add_face">Bæta við andlitinu þínu</string>
     <string name="biometric_setup_backup_lock_method">Settu upp aðra aðferð til að aflæsa</string>
     <string name="biometric_setup_screen_lock_setup">Setja upp skjálæsingu</string>
     <string name="sim_locale_changed">Fann %1$s SIM-kort</string>
     <string name="settings_lockscreen_setup_title">Veldu gerð skjálæsingar</string>
-    <string name="settings_lockscreen_setup_details">Hvernig viltu læsa skjánum þínum\?</string>
+    <string name="settings_lockscreen_setup_details">Hvernig viltu læsa skjánum þínum?</string>
     <string name="lockscreen_setup_title" product="tablet">Verndaðu spjaldtölvuna þína</string>
     <string name="lockscreen_setup_title" product="default">Verndaðu símann þinn</string>
     <string name="lockscreen_setup_summary"><b>Verndaðu tækið</b> og krefstu þess að sett sé inn PIN-númer, mynstur eða lykilorð til að aflæsa skjánum</string>
     <string name="lockscreen_setup_screen_lock_setup">Setja upp</string>
-    <string name="e_account_manager_setup_title">Samstilltu skýjaaðganginn þinn</string>
-    <string name="e_account_manager_setup_summary">Skráðu inn með e.email eða murena.io auðkenni til að tengjast persónulegum aðgangi þínum á þessum síma. Þetta mun samstilla tölvupóstana þína, tengiliði, dagatalsatburði, myndir, myndskeið, glósur og verkefni á milli símans og persónulega tölvuskýsins þíns.</string>
-    <string name="create_account">Búa til aðgang</string>
     <string name="intro_restore_title">Endurheimta forrit og gögn</string>
-    <string name="intro_restore_button">Endurheimta úr öryggisafriti</string>
-    <string name="setup_welcome_message">Velkomin í <xliff:g id="name" example="LineageOS">%1$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="intro_restore_subtitle" product="tablet">Ef þú ert með öryggisafrit af síðustu <xliff:g id="name" example="LineageOS">%s</xliff:g>-spjaldtölvunni þinni, þá geturðu endurheimt það hér.</string>
     <string name="intro_restore_subtitle" product="default">Ef þú ert með öryggisafrit af síðasta <xliff:g id="name" example="LineageOS">%s</xliff:g>-símanum þinum, þá geturðu endurheimt það hér.</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="intro_restore_button">Endurheimta úr öryggisafriti</string>
+    <string name="update_recovery_title">Uppfæra endurheimtingu LineageOS</string>
+    <string name="update_recovery_description">Uppfærir LineageOS endurheimtingarmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
+    <string name="update_recovery_warning">Endurheimtudiskmyndin verður uppfærð um leið og þú lýkur uppsetningunni. Ef þú vilt halda henni ósnertri, skaltu gera þetta óvirkt.</string>
+    <string name="update_recovery_setting">Uppfæra endurheimtingu LineageOS samhliða uppfærslum stýrikerfis</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">Flakk</string>
     <string name="navigation_summary">Veldu þá aðferð við flakk sem þú vilt nota</string>
     <string name="gesture_navigation">Bendingastjórnun</string>
     <string name="two_button_navigation">Tveggja-hnappa stjórnun</string>
     <string name="navbar_navigation">Þriggja-hnappa stjórnun</string>
     <string name="hide_gesture_hint">Fela ábendingu við bendingaflakk</string>
-    <string name="setup_welcome_message_e">Velkomin í
-\n/e/OS</string>
-    <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> með því að senda sjálfvirkt greiningargögn og upplýsingar um notkun til <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Þessar upplýsingar er ekki hægt að nota til að auðkenna þig og hjálpa þróunarteymum við vinnu varðandi ýmis atriði, eins og líftíma rafhlöðu, afköst forrita og nýja eiginleika í <xliff:g id="name" example="LineageOS">%3$s</xliff:g>.</string>
-    <string name="update_recovery_description">Uppfærir LineageOS endurheimtingarmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
-    <string name="update_recovery_warning">Endurheimtudiskmyndin verður uppfærð um leið og þú lýkur uppsetningunni. Ef þú vilt halda henni ósnertri, skaltu gera þetta óvirkt.</string>
-    <string name="update_recovery_description_e">Uppfærir endurheimtingardiskmynd í fyrstu ræsingu á eftir hverri uppfærslu.</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 254d42c6..f8288c7e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installazione guidata</string>
     <string name="next">Avanti</string>
     <string name="skip">Salta</string>
@@ -88,14 +89,4 @@
     <string name="two_button_navigation">Navigazione con due pulsanti</string>
     <string name="navbar_navigation">Navigazione con tre pulsanti</string>
     <string name="hide_gesture_hint">Nascondi i suggerimenti per la navigazione tramite gesti</string>
-    <string name="e_account_manager_setup_configure">Accedi</string>
-    <string name="e_account_manager_setup_summary">Accedi con il tuo ID e.email o murena.io per collegare l\'account a questo telefono. In questo modo sarà possibile sincronizzare email, contatti, eventi del calendario, immagini, video, note e attività tra questo telefono e il proprio cloud.</string>
-    <string name="e_account_manager_setup_title">Sincronizza l\'account cloud</string>
-    <string name="update_recovery_setting_e">Aggiorna la Recovery insieme al SO</string>
-    <string name="update_recovery_description_e">Aggiorna la Recovery al primo riavvio sucessivo ad ogni aggiornamento.</string>
-    <string name="update_recovery_title_e">Aggiorna Recovery</string>
-    <string name="setup_welcome_message_e">Benvenuto a
-\n/e/OS</string>
-    <string name="sign_in">Accedi</string>
-    <string name="create_account">Crea Account</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 58a3891f..39fa9efc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -14,13 +14,14 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Oppsettsveiviser</string>
     <string name="next">Neste</string>
     <string name="skip">Hopp over</string>
     <string name="start">Start</string>
     <string name="done">OK</string>
-    <string name="ok">OK</string>
+    <string name="ok">Ok</string>
     <string name="loading">Vent litt\u2026</string>
     <string name="setup_complete">Konfigureringen er ferdig</string>
     <string name="setup_welcome">Velkommen</string>
@@ -62,4 +63,4 @@
     <string name="lockscreen_setup_title" product="default">Beskytt telefonen</string>
     <string name="lockscreen_setup_summary"><b>Beskytt denne enheten</b> og krev PIN-kode, mønster eller passord for å låse opp skjermen</string>
     <string name="lockscreen_setup_screen_lock_setup">Sett opp</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index af1dbdad..4040a562 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Assistent voor instellen</string>
     <string name="next">Volgende</string>
     <string name="skip">Overslaan</string>
@@ -38,7 +39,7 @@
     <string name="sim_missing_summary" product="default">Geen simkaart gedetecteerd in uw telefoon. Om een simkaart te plaatsen, lees de instructie die bij uw telefoon is geleverd.</string>
     <string name="choose_data_sim_summary" product="tablet">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw tablet in te stellen.</string>
     <string name="choose_data_sim_summary" product="default">Welke simkaart wilt u gebruiken voor mobiel internet? Voor deze simkaart kunnen extra kosten in rekening gebracht worden, omdat deze gebruikt wordt om uw telefoon in te stellen.</string>
-    <string name="date_time_summary">Selecteer uw tijdzone en pas, indien nodig, de huidige datum en tijd aan</string>
+    <string name="date_time_summary">Selecteer uw tijdzone en pas indien nodig de huidige datum en tijd aan.</string>
     <string name="location_access_summary"><b>Apps toestaan die uw toestemming hebben gevraagd</b> om informatie over uw locatie te gebruiken. Dit kan uw huidige locatie en voorgaande locaties omvatten.</string>
     <string name="setup_mobile_data">Mobiele gegevens inschakelen</string>
     <string name="setup_mobile_data_no_service">Geen verbinding</string>
@@ -50,7 +51,7 @@
     <string name="emergency_call">Noodoproep</string>
     <string name="accessibility_settings">Toegankelijkheidsinstellingen</string>
     <string name="setup_services">Functies van LineageOS</string>
-    <string name="services_pp_explanation">Deze diensten worden gebruikt om de mogelijkheden van uw apparaat uit te breiden. Gegevens zullen worden gebruikt conform het privacybeleid van <xliff:g id="name" example="LineageOS">%1$s</xliff:g>.</string>
+    <string name="services_pp_explanation">Deze diensten worden gebruikt om de mogelijkheden van uw apparaat uit te breiden. Gegevens zullen worden gebruikt conform het privacybeleid van <xliff:g id="name" example="LineageOS">%1$s</xliff:g></string>
     <string name="services_find_privacy_policy">U kunt het privacybeleid op een ander apparaat lezen door <xliff:g id="uri" example="https://lineageos.org/legal">%1$s</xliff:g> te bezoeken</string>
     <string name="services_help_improve_cm">Help mee met het verbeteren van <xliff:g id="name" example="LineageOS">%s</xliff:g></string>
     <string name="services_metrics_label"><xliff:g id="name" example="Help improve LineageOS">%1$s</xliff:g> door automatisch diagnose- en verbruiksgegevens te verzenden naar  <xliff:g id="name" example="LineageOS">%2$s</xliff:g>. Deze informatie kan niet gebruikt worden om u te identificeren en helpt de teams om te werken aan zaken zoals levensduur van de accu, app-prestaties en nieuwe <xliff:g id="name" example="LineageOS">%3$s</xliff:g> features.</string>
@@ -78,7 +79,7 @@
     <string name="intro_restore_subtitle" product="default">Als u een back-up heeft van uw laatste <xliff:g id="name" example="LineageOS">%s</xliff:g> tablet, kunt u deze hier herstellen.</string>
     <string name="intro_restore_button">Backup terugzetten</string>
     <string name="update_recovery_title">Lineage Recovery bijwerken</string>
-    <string name="update_recovery_description">Lineage Recovery bijwerken bij de eerste opstart na elke update.</string>
+    <string name="update_recovery_description">Lineage Recovery updaten bij de eerste start na elke update</string>
     <string name="update_recovery_warning">Recovery zal worden bijgewerkt zodra u de installatie hebt voltooid. Als u dit intact wilt houden, schakelt u deze functie uit.</string>
     <string name="update_recovery_setting">Update Lineage Recovery naast het besturingssysteem</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>
@@ -88,14 +89,4 @@
     <string name="two_button_navigation">Navigatie met twee knoppen</string>
     <string name="navbar_navigation">Navigatie met drie knoppen</string>
     <string name="hide_gesture_hint">Verberg gebaren navigatiehint</string>
-    <string name="sign_in">Inloggen</string>
-    <string name="update_recovery_setting_e">Werk Herstel bij samen met het OS</string>
-    <string name="update_recovery_description_e">Werkt Herstel bij tijdens de eerste opstart na elke update.</string>
-    <string name="update_recovery_title_e">Herstel bijwerken</string>
-    <string name="setup_welcome_message_e">Welkom bij
-\n/e/OS</string>
-    <string name="create_account">Account aanmaken</string>
-    <string name="e_account_manager_setup_configure">Inloggen</string>
-    <string name="e_account_manager_setup_summary">Log in met je e.email of murena.io ID om jouw persoonlijk account te verbinden met deze telefoon. Dit zal synchronisatie inschakelen voor e-mails, contacten, agenda items, afbeeldingen, video\'s, notities en taken tussen deze telefoon en je persoonlijke cloud.</string>
-    <string name="e_account_manager_setup_title">Synchroniseer jouw cloud account</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 38c8f467..a64df00e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Мастер настройки</string>
     <string name="next">Далее</string>
     <string name="skip">Пропустить</string>
@@ -23,7 +24,7 @@
     <string name="ok">ОК</string>
     <string name="loading">Секунду\u2026</string>
     <string name="setup_complete">Настройка завершена</string>
-    <string name="setup_welcome">Добро пожаловать</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>
@@ -88,14 +89,4 @@
     <string name="two_button_navigation">Навигация двумя кнопками</string>
     <string name="navbar_navigation">Навигация тремя кнопками</string>
     <string name="hide_gesture_hint">Скрыть подсказку навигации жестами</string>
-    <string name="update_recovery_setting_e">Обновление Recovery наряду с ОС</string>
-    <string name="update_recovery_description_e">Обновляет Recovery при первой загрузке после каждого обновления.</string>
-    <string name="update_recovery_title_e">Обновление Recovery</string>
-    <string name="setup_welcome_message_e">Добро пожаловать
-\nв /e/OS</string>
-    <string name="sign_in">Войти</string>
-    <string name="e_account_manager_setup_configure">Войти</string>
-    <string name="e_account_manager_setup_summary">Войдите в систему с помощью e.email или murena.io ID , чтобы подключить свою личную учётную запись к этому телефону. Это позволит синхронизировать электронную почту, контакты, события календаря, изображения, видео, заметки и задачи между этим телефоном и вашим личным облаком.</string>
-    <string name="e_account_manager_setup_title">Синхронизируйте свою облачную учётную запись</string>
-    <string name="create_account">Создать учётную запись</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 448c1791..9016550f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -14,7 +14,8 @@
      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">
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Installationsguide</string>
     <string name="next">Nästa</string>
     <string name="skip">Hoppa över</string>
@@ -60,6 +61,5 @@
     <string name="settings_lockscreen_setup_details">Hur vill du låsa din skärm?</string>
     <string name="lockscreen_setup_title" product="default">Skydda mobilen</string>
     <string name="lockscreen_setup_summary"><b>Skydda den här enheten</b> och kräv pinkod, mönster eller lösenord för att låsa upp skärmen</string>
-    <string name="create_account">Skapa konto</string>
     <string name="intro_restore_title">Återställ appar och data</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 70bf8d1e..cff3db53 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2,7 +2,6 @@
 <!--
      Copyright (C) 2013-2015 The CyanogenMod Project
      Copyright (C) 2017-2020, 2022 The LineageOS Project
-     Copyright (C) 2018-2022 E FOUNDATION
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -115,18 +114,4 @@
     <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>
-
-    <!-- e.foundation -->
-    <string name="e_account_manager_setup_title">Sync your cloud account</string>
-    <string name="e_account_manager_setup_summary">Log in with your e.email or murena.io ID to connect your personal account with this phone. This will enable to synchronize your emails, contacts, calendar events, pictures, videos, notes and tasks across this phone and your personal cloud.</string>
-    <string name="e_account_manager_setup_configure">Log in</string>
-
-    <string name="create_account">Create Account</string>
-    <string name="sign_in">Sign in</string>
-
-    <string name="setup_welcome_message_e">Welcome to \n/e/OS</string>
-
-    <string name="update_recovery_title_e">Update Recovery</string>
-    <string name="update_recovery_description_e">Updates Recovery on first boot subsequent to every update.</string>
-    <string name="update_recovery_setting_e">Update Recovery alongside the OS</string>
 </resources>
-- 
GitLab