Merge branch '1172-main-broken_string' into 'main'

Make string reference non translatable and remove already translated strings

See merge request e/os/advanced-privacy!125

4 files changed, 1 insertions, 4 deletions

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9c4595d..5b9797a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -107,7 +107,6 @@
     <string name="notifications_first_boot_channel_name">Erster Start</string>
     <string name="trackers_info_more">Mehr erfahren</string>
     <string name="error_no_activity_view_url">Keine App, um Webseiten anzusehen</string>
-    <string name="trackers_applist_infos">\@string/ipscrambling_app_list_infos</string>
     <string name="dummy_apps_compatibility_app_label">Kompatibilität mit Apps</string>
     <string name="apptrackers_reset">Tracker zurücksetzen</string>
     <string name="app_trackers_no_trackers_yet_remaining_whitelist">Es wurden keine Tracker entdeckt. Einige Tracker wurden im Vorfeld erlaubt.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6d98057..b1dc61e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -103,7 +103,6 @@
     <string name="graph_legend_blocked">Fugas bloqueadas</string>
     <string name="close">Cerrar</string>
     <string name="ok">Ok</string>
-    <string name="trackers_applist_infos">\@string/ipscrambling_app_list_infos</string>
     <string name="graph_empty_message">Enhorabuena. Ningún rastreador te está haciendo un perfil.</string>
     <string name="dashboard_graph_leaking_app">Vista</string>
     <string name="widget_graph_view_trackers">Vista</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 20c589c..559fc56 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -97,7 +97,6 @@
     <string name="warningdialog_do_not_show_again">Ne plus afficher</string>
     <string name="ok">OK</string>
     <string name="trackers_info_more">En savoir plus</string>
-    <string name="trackers_applist_infos">\@string/ipscrambling_app_list_infos</string>
     <string name="error_no_activity_view_url">Aucune application pour afficher des pages web</string>
     <string name="notifications_fake_location_content">Toutes les applications utilisant votre position y compris votre application de navigation utilisent désormais cette position fictive.</string>
     <string name="notifications_fake_location_title">Position fictive activée</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 49d9182..230b0a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -81,7 +81,7 @@
     <string name="trackers_period_month">past month</string>
     <string name="trackers_period_year">past year</string>
     <string name="trackers_applist_title">Manage trackers used in applications * :</string>
-    <string name="trackers_applist_infos">@string/ipscrambling_app_list_infos</string>
+    <string name="trackers_applist_infos" translatable="false">@string/ipscrambling_app_list_infos</string>
 
     <string name="trackers_graph_hours_period_format">HH:mm</string>
     <string name="trackers_graph_days_period_format">MMMM d - EEE</string>