From 575edfbef34f44647fbaa54918896f6f1c820fd6 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 28 Sep 2023 17:56:27 +0530 Subject: [PATCH 1/2] Move our string modifications to e_strings.xml --- res/values-de/e_strings.xml | 22 ++++++++++++++++++ res/values-fr/e_strings.xml | 18 +++++++++++++++ res/values-is/e_strings.xml | 27 ++++++++++++++++++++++ res/values-it/e_strings.xml | 20 ++++++++++++++++ res/values-nl/e_strings.xml | 29 +++++++++++++++++++++++ res/values-ru/e_strings.xml | 40 ++++++++++++++++++++++++++++++++ res/values-sv/e_strings.xml | 19 +++++++++++++++ res/values/e_strings.xml | 42 ++++++++++++++++++++++++++++++++++ res/xml/top_level_settings.xml | 2 +- 9 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 res/values-is/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 diff --git a/res/values-de/e_strings.xml b/res/values-de/e_strings.xml index 1a991173852..8493f9a8a90 100644 --- a/res/values-de/e_strings.xml +++ b/res/values-de/e_strings.xml @@ -16,4 +16,26 @@ --> Wenn Sie dieses Konto entfernen, werden Sie weder Ihre Daten noch Ihre E-Mails von diesem Gerät aus abrufen können. Sie können dies zu einem beliebigen Zeitpunkt aber wieder aktivieren. + Bildschirmsperre, App-Sicherheit + /e/ Lizenz + /e/ OS-Version + Aktualisierungen, Einstellungen, Versionshinweise + Verbinden mit /e/OS-Testkanal + Zugang zu Testversionen von /e/OS + Sie sind dabei, sich mit dem /e/OS-Testkanal zu verbinden + Damit können Sie Testversionen von /e/OS herunterladen und installieren. Diese Versionen können instabil sein und sollten nur zu Testzwecken verwendet werden. Bitte akzeptieren Sie nur, wenn Sie wissen, was Sie tun. + Dadurch werden alle Daten vom internen Speicher Ihres Tablets gelöscht. , einschließlich: +\n +\n
  • Alle Ihre Konten
    • +\n
  • System- und Anwendungsdaten und Einstellungen
    • +\n
  • Heruntergeladene Anwendungen
    •  + Tracker verwalten, Standort fälschen, IP-Adresse verbergen + Aktualisiert auf /e/OS v%1$s + /e/OS v%1$s - Aktualisierung verfügbar + /e/OS v%1$s - Aktualisierung läuft + /e/OS v%1$s - installiert, Neustart erforderlich + Dies erlaubt automatische Fehlermeldungen, wenn eine App abstürzt oder einfriert. Bitte starten Sie ihr Gerät nach einer Abänderung dieser Einstellung neu. + Sie sind gerade dabei, /e/OS-Telemetrie zu aktivieren + Automatische Fehlermeldungen aktivieren + /e/OS-Telemetrie aktivieren     \ No newline at end of file diff --git a/res/values-fr/e_strings.xml b/res/values-fr/e_strings.xml index 45c8abe3a69..7056ff434e1 100644 --- a/res/values-fr/e_strings.xml +++ b/res/values-fr/e_strings.xml @@ -16,4 +16,22 @@ --> En supprimant ce compte, vous n\'aurez plus accès à ses données depuis cet appareil, e-mails inclus. Vous pouvez le réajouter à tout moment. + Verrouillage de l\'écran, sécurité des applications + /e/OS v%1$s - installée, redémarrage nécessaire + /e/OS v%1$s - mise à jour en cours + /e/OS v%1$s - mise à jour disponible + Mis à jour vers /e/OS v%1$s + Cela effacera toutes les données de la mémoire interne de votre téléphone, y compris :\n\n
  • Tous vos comptes
    • \n
  • Les paramètres et donnée du système et des applications
    • \n
  • les applications téléchargées
    •  + Gérer les trackers, falsifier la position et masquer l\'adresse IP + Activer la génération automatique de rapports de bugs + Cela permettra la génération automatique de rapports de bug quand une application plante ou quand elle termine dans un état imprévu. Merci de redémarrer votre appareil pour que la modification de ce paramètre soit prise en compte. + Vous êtes sur le point d\'activer la télémétrie pour /e/OS + Activer la télémétrie sur /e/OS + Cela vous permettra de télécharger et installer les versions de test d\'/e/OS. Ces versions peuvent être instables et ne devraient être utilisés qu\'à des fins de test. Merci de n\'accepter que si vous savez ce que vous êtes en train de faire. + Vous êtes sur le point de vous connecter au canal de test d\'/e/OS + Mises à jour, préférences, notes de version + Accéder aux versions de test d\'/e/OS + Se connecter au canal de test d\'/e/OS + Informations légales de /e/ + Version d\'/e/OS     \ 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 00000000000..db137cfa9f6 --- /dev/null +++ b/res/values-is/e_strings.xml @@ -0,0 +1,27 @@ + + + + Skjálæsing, öryggi forrita + Uppfærslur, kjörstillingar, útgáfuupplýsingar + Lagalegir fyrirvarar /e/ + Útgáfa /e/ OS + Virkja fjarmælingar /e/OS + Virkja sjálfvirkar tilkynningar um vandamál + Þú ert við það að virkja fjarmælingar /e/OS kerfisins + Sýsla með rekjara, falsa staðsetningu, fela IP-vistfang + Þetta gerir kleift að senda sjálfvirkar villuskýrslur þegar forrit hrynja eða festast í óvæntu ástandi. Endurræstu tækið þitt eftir að þessari stillingu er breytt. + \ No newline at end of file diff --git a/res/values-it/e_strings.xml b/res/values-it/e_strings.xml index 9a3a2fffaea..cac124fdbe8 100644 --- a/res/values-it/e_strings.xml +++ b/res/values-it/e_strings.xml @@ -16,4 +16,24 @@ --> Rimuovendo l\'account, i relativi dati ed e-mail diverranno indisponibili sul dispositivo. Potrai comunque aggiungere nuovamente l\'account in qualsiasi momento ed essi torneranno disponibili. + Stai abilitando la Telemetria /e/OS + Abilita la telemetria /e/OS + Versione di /e/OS + Aggiornamenti, preferenze, note di rilascio + Collega al canale di test di /e/OS + Accedi ai rilasci di test di /e/OS + Stai per collegarti al canale di test di /e/OS + Gestisci i tracker, falsifica la posizione, nascondi il tuo indirizzo IP + Questa operazione cancellerà tutti i dati dalla memoria interna del tuo tablet, inclusi: +\n +\n
  • Tutti gli account
    • +\n
  • Dati e impostazioni di Sistema e app
    • +\n
  • App scaricate
    •  + /e/OS v%1$s - aggiornamento disponibile + /e/OS v%1$s - aggiornamento in corso + Abilita la comunicazione automatica dei bug + Consente di comunicare automaticamente i bug in caso di arresto anomalo dell\'app o quando l\'app si trova in uno stato imprevisto. Dopo aver modificato questa impostazione, dovresti riavviare il dispositivo. + Permette di scaricare e installare versioni di test di /e/ OS. Tali versioni possono essere instabili e devono essere usate solo a scopo di test. Accetta solo se sai cosa stai facendo. + Aggiornato a /e/OS v%1$s + /e/OS v%1$s - installato Riavvio obbligatorio     \ 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 00000000000..246eaea3338 --- /dev/null +++ b/res/values-nl/e_strings.xml @@ -0,0 +1,29 @@ + + + + Schermvergrendeling, app beveiliging + Dit staat automatische foutrapporten toe wanneer een applicatie crasht of bevriest. Herstart a.u.b. jouw toestel nadat je deze instelling hebt gewijzigd. + Je staat op het punt om /e/OS Telemetrie te activeren + Activeer automatische foutrapporten + Activeer /e/OS Telemetrie + /e/ juridisch + /e/ OS versie + Updates, voorkeuren, release notes + Verbindt met /e/ OS test kanaal + Toegang tot test releases van /e/ OS + Je staat op het punt te verbinden met het /e/ OS test kanaal + \ 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 00000000000..e02b1f064f2 --- /dev/null +++ b/res/values-ru/e_strings.xml @@ -0,0 +1,40 @@ + + + + Блокировка экрана, безопасность приложений + Это позволит автоматически сообщать об ошибках при сбое приложения или когда приложение переходит в неожиданное состояние. Пожалуйста, перезагрузите устройство после изменения этой настройки. + Вы собираетесь включить /e/OS телеметрию + Включить автоматическое информирование об ошибках + Включить /e/OS телеметрию + /e/OS v%1$s - установлена, требуется перезагрузка + /e/OS v%1$s - обновление в процессе + /e/OS v%1$s - доступно обновление + Обновлено до /e/OS v%1$s + Это приведет к удалению всех данных из внутренней памяти вашего планшета, в том числе: +\n +\n
  • Всей вашей учётной записи
    • +\n
  • Системных данных и данных приложений и настроек
    • +\n
  • Загруженных приложений
    •  + правление трекерами, фиктивное определение местоположения, скрытие IP-адреса + Это позволит вам загрузить и установить тестовые версии /e/OS. Эти сборки могут быть нестабильными, и их следует использовать только в тестовых целях. Пожалуйста, соглашайтесь только в том случае, если вы знаете, что делаете. + Вы собираетесь подключиться к тестовому каналу /e/OS + Доступ к тестовым выпускам /e/OS + Подключение к тестовому каналу /e/OS + Обновления, настройки, примечания к выпуску + Юридическая информация /e/ + Версия /e/ OS +     \ 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 00000000000..5b51cfa43bd --- /dev/null +++ b/res/values-sv/e_strings.xml @@ -0,0 +1,19 @@ + + + + Skärmlås, appsäkerhet + \ No newline at end of file diff --git a/res/values/e_strings.xml b/res/values/e_strings.xml index 40ab92bada2..d51cb951f50 100644 --- a/res/values/e_strings.xml +++ b/res/values/e_strings.xml @@ -18,4 +18,46 @@ If you remove this account you will not be able to access its data from this device anymore including its emails. You can add it back whenever you want. Auto-refresh contents Allow apps to automatically refresh contents in the background + Screen lock, app security + + + /e/ OS version + + + /e/ legal + + + Sentry User ID + + + Updates, preferences, release notes + + + Connect to /e/ OS test channel + Access test releases of /e/ OS + You are about to connect to /e/ OS test channel + It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing. + + + Quad9 DNS + + + Enable /e/OS Telemetry + Enable automatic bug reporting + You are about to enable /e/OS Telemetry + It will allow automatic bug report when an application crash or when the application ends up in an unexpected state. Please reboot your device after changing this setting. + + + Advanced Privacy + Manage trackers, fake location, hide IP address + + + This will erase all data from your tablet\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  + This will erase all data from your phone\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  + + + Updated to /e/OS v%1$s + /e/OS v%1$s - update available + /e/OS v%1$s - update in progress + /e/OS v%1$s - installed reboot required \ No newline at end of file diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml index 51685df6184..d13ce995d11 100644 --- a/res/xml/top_level_settings.xml +++ b/res/xml/top_level_settings.xml @@ -163,7 +163,7 @@ android:key="top_level_security" android:order="-50" android:title="@string/security_settings_title" - android:summary="@string/security_dashboard_summary_e" + android:summary="@string/e_security_dashboard_summary" settings:highlightableMenuKey="@string/menu_key_security" settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/> -- GitLab From 37e83cf4904b36d093c295bd56e86b1bb5cd3c77 Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Thu, 28 Sep 2023 18:02:48 +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/cm_strings.xml | 43 --------------------------------------- res/values/strings.xml | 9 +++----- 2 files changed, 3 insertions(+), 49 deletions(-) diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index 165c7cd9aa9..d9ca1571676 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -184,47 +184,4 @@ Download satellite assistance data from the internet which can greatly improve the GPS startup performance. For emergency calls, assisted GPS is always allowed. - - - - - /e/ OS version - - - /e/ legal - - - Sentry User ID - - - Updates, preferences, release notes - - - Connect to /e/ OS test channel - Access test releases of /e/ OS - You are about to connect to /e/ OS test channel - It will allow you to download and install test versions of /e/ OS. Those builds may be unstable, and should be used only for test purposes. Please accept only if you know what you are doing. - - - Quad9 DNS - - - Enable /e/OS Telemetry - Enable automatic bug reporting - You are about to enable /e/OS Telemetry - It will allow automatic bug report when an application crash or when the application ends up in an unexpected state. Please reboot your device after changing this setting. - - - Advanced Privacy - Manage trackers, fake location, hide IP address - - - This will erase all data from your tablet\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  - This will erase all data from your phone\u2019s internal storage, including:\n\n
  • All your account
    • \n
  • System and app data and settings
    • \n
  • Downloaded apps
    •  - - - Updated to /e/OS v%1$s - /e/OS v%1$s - update available - /e/OS v%1$s - update in progress - /e/OS v%1$s - installed reboot required diff --git a/res/values/strings.xml b/res/values/strings.xml index b245b63c920..044d70e4292 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -790,9 +790,6 @@ App security, device lock, permissions - - Screen lock, app security - @@ -6445,7 +6442,7 @@ Mobile network signal - @string/menu_stats_last_unplugged + @string/menu_stats_last_unplugged Device awake time @@ -12885,13 +12882,13 @@ System Graphics Driver - + @string/graphics_driver_app_preference_default @string/graphics_driver_app_preference_production_driver @string/graphics_driver_app_preference_prerelease_driver - + @string/graphics_driver_app_preference_default @string/graphics_driver_app_preference_prerelease_driver @string/graphics_driver_app_preference_production_driver -- GitLab