From 8089beab35a9534aeac05938a6ad27991ec6a741 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Mon, 16 May 2022 18:01:16 +0530
Subject: Make referenced strings and app name not translatable

---
 app/src/main/res/values-de/strings.xml |  6 ++----
 app/src/main/res/values-es/strings.xml | 15 +--------------
 app/src/main/res/values-fi/strings.xml | 15 +--------------
 app/src/main/res/values-fr/strings.xml |  4 +---
 app/src/main/res/values-it/strings.xml |  4 +---
 app/src/main/res/values/strings.xml    | 28 ++++++++++++++--------------
 6 files changed, 20 insertions(+), 52 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2f055d3..0d92e96 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Fortgeschrittener Datenschutz</string>
     <string name="dashboard_state_title_off">Dein Online-Datenschutz ist nicht gewährleistet</string>
     <string name="dashboard_state_trackers_label">Tracker (Verfolger):</string>
     <string name="dashboard_state_trackers_off">Verletzlich</string>
@@ -24,7 +23,6 @@
     <string name="dashboard_internet_activity_privacy_subtitle_on">Echte IP-Adresse versteckt</string>
     <string name="ipscrambling_title">Verwalte meine Internet-Adressen</string>
     <string name="dashboard_state_title_on">Dein Online-Datenschutz ist gewährleistet</string>
-    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_internet_activity_privacy_subtitle_off">Echte IP-Adresse aufgedeckt</string>
     <string name="dashboard_state_geolocation_off">Aufgedeckt</string>
     <string name="dashboard_state_ipaddress_off">Aufgedeckt</string>
@@ -108,7 +106,7 @@
     <string name="graph_empty_message">Glückwunsch! Es wird kein Profil über dich von Trackern erstellt.</string>
     <string name="graph_legend_blocked">Blockiertes Durchsickern persönlicher Daten</string>
     <string name="graph_legend_allowed">Erlaubtes Durchsickern persönlicher Daten</string>
-    <string name="first_notification_title">Entdecke fortgeschrittenen Datenschutz</string>
+    <string name="first_notification_title">Entdecke Advanced Privacy</string>
     <string name="graph_subtitle">Tippe auf die Balken für mehr Information.</string>
     <string name="first_notification_summary">Tippe, um herauszufinden, wie Tracker einfach blockiert, Standort gefälscht und IP-Adressen versteckt werden können.</string>
     <string name="dashboard_state_title_custom">Benutzerdefinierte Datenschutz-Einstellungen werden angewendet</string>
@@ -118,4 +116,4 @@
     <string name="widget_state_title_custom">Benutzerdefinierte Datenschutz-Einstellungen werden angewandt</string>
     <string name="widget_graph_view_trackers">Ansicht</string>
     <string name="dashboard_graph_leaking_app">Ansicht</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6bd8dc8..980c41a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_trackers_label">Rastreadores:</string>
     <string name="dashboard_state_trackers_off">Vulnerable</string>
     <string name="dashboard_state_trackers_on">Denegado</string>
@@ -82,7 +81,6 @@
     <string name="apps_access_to_permission">Aplicaciones que tienen acceso al permiso %1$s</string>
     <string name="user_location_permission_explanation">Esta aplicación necesita permisos de ubicación para poder mostrar su funcionalidad.</string>
     <string name="enable_disable_tracker_info">Activar o desactivar este rastreador para las siguientes aplicaciones</string>
-    <string name="app_name">Centro de Privacidad</string>
     <string name="dashboard_state_title_on">Su privacidad en línea está protegida</string>
     <string name="dashboard_graph_trackers_legend">%s rastreadores te han perfilado en las últimas 24 horas</string>
     <string name="dashboard_location_title">Gestionar mi ubicación</string>
@@ -105,17 +103,6 @@
     <string name="add_widget">Añadir widget</string>
     <string name="widget_state_title_on">Su privacidad en línea está protegida</string>
     <string name="widget_state_title_off">Su privacidad en línea está desprotegida</string>
-    <string name="widget_state_trackers_label">\@string/dashboard_state_trackers_label</string>
-    <string name="widget_state_trackers_off">\@string/dashboard_state_trackers_off</string>
-    <string name="widget_state_geolocation_label">\@string/dashboard_state_geolocation_label</string>
-    <string name="widget_state_geolocation_off">\@string/dashboard_state_geolocation_off</string>
-    <string name="widget_state_geolocation_on">\@string/dashboard_state_geolocation_on</string>
-    <string name="widget_state_ipaddress_label">\@string/dashboard_state_ipaddress_label</string>
-    <string name="widget_state_ipaddress_on">\@string/dashboard_state_ipaddress_on</string>
-    <string name="widget_graph_trackers_legend">\@string/dashboard_graph_trackers_legend</string>
-    <string name="widget_title">\@string/app_name</string>
     <string name="apptrackers_error_no_app">Aplicación no instalada.</string>
     <string name="app_widget_description">Esta es la descripción de un widget de aplicación</string>
-    <string name="widget_state_trackers_on">\@string/dashboard_state_trackers_on</string>
-    <string name="widget_state_ipaddress_off">\@string/dashboard_state_ipaddress_off</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index b015c6e..9ff16be 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -4,20 +4,9 @@
     <string name="first_notification_summary">Napauta nädäksesi, miten helposti voit estää seuraimet, väärentää sijaintisi ja piilottaa IP-osoitteesi.</string>
     <string name="first_notification_title">Tutustu Advanced Privacy:n</string>
     <string name="widget_graph_view_trackers">Näytä</string>
-    <string name="widget_graph_trackers_legend">\@string/dashboard_graph_trackers_legend</string>
-    <string name="widget_state_ipaddress_on">\@string/dashboard_state_ipaddress_on</string>
-    <string name="widget_state_ipaddress_off">\@string/dashboard_state_ipaddress_off</string>
-    <string name="widget_state_ipaddress_label">\@string/dashboard_state_ipaddress_label</string>
-    <string name="widget_state_geolocation_on">\@string/dashboard_state_geolocation_on</string>
-    <string name="widget_state_geolocation_off">\@string/dashboard_state_geolocation_off</string>
-    <string name="widget_state_geolocation_label">\@string/dashboard_state_geolocation_label</string>
-    <string name="widget_state_trackers_on">\@string/dashboard_state_trackers_on</string>
-    <string name="widget_state_trackers_off">\@string/dashboard_state_trackers_off</string>
-    <string name="widget_state_trackers_label">\@string/dashboard_state_trackers_label</string>
     <string name="widget_state_title_custom">Sovelletaan mukautettuja yksityisyysasetuksia</string>
     <string name="widget_state_title_off">Yksityisyyttäsi verkossa ei ole suojattu</string>
     <string name="widget_state_title_on">Yksityisyytesi verkossa on suojattu</string>
-    <string name="widget_title">\@string/app_name</string>
     <string name="app_widget_description">Tämä on sovelluksen widgetin kuvaus</string>
     <string name="add_widget">Lisää widget</string>
     <string name="appwidget_text">ESIMERKKI</string>
@@ -110,7 +99,6 @@
     <string name="dashboard_state_trackers_label">Seuraimet:</string>
     <string name="dashboard_state_title_custom">Sovelletaan mukautettuja yksityisyysasetuksia</string>
     <string name="dashboard_state_title_on">Yksityisyytesi verkossa on suojattu</string>
-    <string name="dashboard_title">\@string/app_name</string>
     <string name="close">Sulje</string>
     <string name="quickprivacy_disabled_message">Muutokset tulevat voimaan vain, kun yksityisyydensuojan kytkin on käytössä.</string>
     <string name="graph_subtitle">Napauta palkkeja saadaksesi lisätietoja.</string>
@@ -118,7 +106,6 @@
     <string name="graph_legend_blocked">Estettyjä tietovuotoja</string>
     <string name="graph_empty_message">Onnittelut! Yksikään seurain ei profiloi sinua.</string>
     <string name="dummy_system_app_label">Järjestelmä</string>
-    <string name="app_name">Advanced Privacy</string>
     <string name="ipscrambling_hide_ip_subtitle">Olen anonyymi internetissä</string>
     <string name="ipscrambling_hide_ip_label">Piilota todellinen IP-osoitteeni</string>
     <string name="ipscrambling_real_ip_subtitle">Toimintojani voidaan seurata IP-osoitteeni perusteella</string>
@@ -129,4 +116,4 @@
     <string name="ipscrambling_title">Hallitse internet-osoitettani</string>
     <string name="dashboard_internet_activity_privacy_subtitle_on">Todellinen IP-osoite piilotettu</string>
     <string name="dashboard_internet_activity_privacy_subtitle_off">Todellinen IP-osoite paljastettu</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c0a8582..02a2821 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -30,8 +30,6 @@
     <string name="ipscrambling_location_label">Mon activité internet doit apparaître depuis :</string>
     <string name="ipscrambling_any_location">Pays aléatoire</string>
     <string name="ipscrambling_select_app">Appliquer ce paramètre à toutes les applications sélectionnées :</string>
-    <string name="app_name">Centre de Confidentialité</string>
-    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_graph_trackers_legend">%s pisteurs vous ont profilé au cours des dernières 24 heures</string>
     <string name="dashboard_am_i_tracked_title">Gérer les pisteurs d\'applications</string>
     <string name="dashboard_am_i_tracked_subtitle">%1$d pisteurs d\'apps, %2$d pisteurs actifs</string>
@@ -100,4 +98,4 @@
     <string name="quick_protection_settings_list">- Tous les pisteurs sont désactivés.
 \n- Votre géolocalisation sera falsifiée.
 \n- Votre adresse IP réelle sera masquée.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bb61330..e5c829f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="dashboard_title">@string/app_name</string>
     <string name="dashboard_state_title_off">La tua privacy online non è protetta</string>
     <string name="dashboard_state_trackers_label">Trackers:</string>
     <string name="dashboard_state_trackers_off">Vulnerabile</string>
@@ -82,7 +81,6 @@
     <string name="trackers">Trackers</string>
     <string name="following_trackers_in_use">Sono attivi i seguenti trackers</string>
     <string name="tracker">Tracker</string>
-    <string name="app_name">AppCentralePrivacy</string>
     <string name="dashboard_state_title_on">La tua privacy online è protetta</string>
     <string name="dashboard_graph_trackers_legend">%s tracker ti hanno profilato nelle ultime 24 ore</string>
     <string name="dashboard_location_subtitle_specific">Specifica geolocalizzazione fasulla</string>
@@ -100,4 +98,4 @@
     <string name="random_location_mode">Modalità posizione casuale</string>
     <string name="user_location_permission_explanation">Questa app necessita il permesso di conoscere la posizione per poter funzionare.</string>
     <string name="enable_disable_tracker_info">Abilita o disabilita questo tracker per le app seguenti</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c1f15f0..a08961b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Advanced Privacy</string>
+    <string name="app_name" translatable="false">Advanced Privacy</string>
 
     <!-- Commons -->
     <string name="dummy_system_app_label">System</string>
@@ -11,7 +11,7 @@
     <string name="close">Close</string>
 
     <!-- Dashboard -->
-    <string name="dashboard_title">@string/app_name</string>
+    <string name="dashboard_title" translatable="false">@string/app_name</string>
     <string name="dashboard_state_title_on">Your online privacy is protected</string>
     <string name="dashboard_state_title_off">Your online privacy is unprotected</string>
     <string name="dashboard_state_title_custom">Custom privacy settings applied</string>
@@ -127,22 +127,22 @@
     <string name="app_widget_description">This is an app widget description</string>
 
     <!-- Widget -->
-    <string name="widget_title">@string/app_name</string>
+    <string name="widget_title" translatable="false">@string/app_name</string>
     <string name="widget_state_title_on">Your online privacy is protected</string>
     <string name="widget_state_title_off">Your online privacy is unprotected</string>
     <string name="widget_state_title_custom">Custom privacy settings applied</string>
-    <string name="widget_state_trackers_label">@string/dashboard_state_trackers_label</string>
-    <string name="widget_state_trackers_off">@string/dashboard_state_trackers_off</string>
-    <string name="widget_state_trackers_on">@string/dashboard_state_trackers_on</string>
-    <string name="widget_state_geolocation_label">@string/dashboard_state_geolocation_label</string>
-    <string name="widget_state_geolocation_off">@string/dashboard_state_geolocation_off</string>
-    <string name="widget_state_geolocation_on">@string/dashboard_state_geolocation_on</string>
-    <string name="widget_state_ipaddress_label">@string/dashboard_state_ipaddress_label</string>
-    <string name="widget_state_ipaddress_off">@string/dashboard_state_ipaddress_off</string>
-    <string name="widget_state_ipaddress_on">@string/dashboard_state_ipaddress_on</string>
-    <string name="widget_graph_trackers_legend">@string/dashboard_graph_trackers_legend</string>
+    <string name="widget_state_trackers_label" translatable="false">@string/dashboard_state_trackers_label</string>
+    <string name="widget_state_trackers_off" translatable="false">@string/dashboard_state_trackers_off</string>
+    <string name="widget_state_trackers_on" translatable="false">@string/dashboard_state_trackers_on</string>
+    <string name="widget_state_geolocation_label" translatable="false">@string/dashboard_state_geolocation_label</string>
+    <string name="widget_state_geolocation_off" translatable="false">@string/dashboard_state_geolocation_off</string>
+    <string name="widget_state_geolocation_on" translatable="false">@string/dashboard_state_geolocation_on</string>
+    <string name="widget_state_ipaddress_label" translatable="false">@string/dashboard_state_ipaddress_label</string>
+    <string name="widget_state_ipaddress_off" translatable="false">@string/dashboard_state_ipaddress_off</string>
+    <string name="widget_state_ipaddress_on" translatable="false">@string/dashboard_state_ipaddress_on</string>
+    <string name="widget_graph_trackers_legend" translatable="false">@string/dashboard_graph_trackers_legend</string>
     <string name="widget_graph_view_trackers">View</string>
 
     <string name="first_notification_title">Discover Advanced Privacy</string>
     <string name="first_notification_summary">Tap to find out how to easily block trackers, fake your location &amp; hide your IP address.</string>
-</resources>
\ No newline at end of file
+</resources>
-- 
cgit v1.2.1