diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 31 | ||||
| -rw-r--r-- | app/src/main/res/layout/widget.xml | 50 | ||||
| -rw-r--r-- | app/src/main/res/values-de/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values-es/strings.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values-fi/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values-fr/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values-it/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 8 |
8 files changed, 76 insertions, 47 deletions
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 8b8792b..cedf569 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -42,12 +42,6 @@ android:textSize="14sp" android:textColor="@color/secondary_text" /> - <Switch - android:id="@+id/toggle_privacy_central" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:layout_margin="16dp" - /> </LinearLayout> <View android:layout_width="match_parent" @@ -69,8 +63,9 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -89,13 +84,19 @@ android:textColor="@color/primary_text" android:textAllCaps="true" /> + <Switch + android:id="@+id/toggle_trackers" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > <TextView android:layout_width="wrap_content" @@ -115,13 +116,19 @@ android:textColor="@color/primary_text" android:textAllCaps="true" /> + <Switch + android:id="@+id/toggle_location" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> <LinearLayout android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" - android:paddingStart="8dp" + android:gravity="center_horizontal" > <TextView android:layout_width="wrap_content" @@ -148,6 +155,12 @@ android:text="@string/dashboard_state_ipaddress_off" android:layout_height="16dp" android:indeterminate="true" android:visibility="visible"/> + <Switch + android:id="@+id/toggle_ipscrambling" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:layout_margin="12dp" + /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml index 60cbffa..1e78bc7 100644 --- a/app/src/main/res/layout/widget.xml +++ b/app/src/main/res/layout/widget.xml @@ -72,13 +72,6 @@ android:textSize="12sp" android:textColor="@color/on_primary_medium_emphasis" /> - <ImageView - android:id="@+id/toggle_privacy_central" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_switch_disabled" - /> - </LinearLayout> <LinearLayout android:layout_width="match_parent" @@ -92,6 +85,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/trackers_label" @@ -106,11 +100,19 @@ <TextView android:id="@+id/state_trackers" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_trackers_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" + android:gravity="center" + /> + <ImageView + android:id="@+id/toggle_trackers" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" /> </LinearLayout> <LinearLayout @@ -118,6 +120,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/geolocation_label" @@ -132,11 +135,19 @@ <TextView android:id="@+id/state_geolocation" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_geolocation_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" + android:gravity="center" + /> + <ImageView + android:id="@+id/toggle_location" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" /> </LinearLayout> <LinearLayout @@ -144,6 +155,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:orientation="vertical" + android:gravity="center_horizontal" > <TextView android:id="@+id/ip_address_label" @@ -158,19 +170,27 @@ <TextView android:id="@+id/state_ip_address" android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_height="18dp" android:text="@string/dashboard_state_ipaddress_off" - android:textSize="14sp" + android:textSize="12sp" android:textColor="@color/on_primary_high_emphasis" android:textAllCaps="true" android:visibility="gone" + android:gravity="center" /> <ProgressBar android:id="@+id/state_ip_address_loader" - android:layout_width="16dp" - android:layout_height="16dp" + android:layout_width="18dp" + android:layout_height="18dp" android:indeterminate="true" android:visibility="visible"/> + <ImageView + android:id="@+id/toggle_ipscrambling" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:src="@drawable/ic_switch_disabled" + /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index cda8aa8..ea0bacd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <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_label">Tracker (Verfolger)</string> <string name="dashboard_state_trackers_off">Verletzlich</string> <string name="dashboard_state_trackers_on">Abgelehnt</string> - <string name="dashboard_state_geolocation_label">Standort:</string> + <string name="dashboard_state_geolocation_label">Standort</string> <string name="dashboard_state_geolocation_on">Verschleiert</string> - <string name="dashboard_state_ipaddress_label">Echte IP-Adresse:</string> + <string name="dashboard_state_ipaddress_label">Echte IP-Adresse</string> <string name="dashboard_state_ipaddress_on">Verschleiert</string> <string name="dashboard_graph_label">Datenlecks (Nutzerdaten):</string> <string name="dashboard_graph_period">Heute</string> @@ -110,7 +110,6 @@ <string name="graph_subtitle">Tippe auf die Balken für weitere Informationen.</string> <string name="first_notification_summary">Tippe, um herauszufinden, wie Tracker einfach blockiert, dein Standort gefälscht und deine IP-Adresse verschleiert werden kann.</string> <string name="dashboard_state_title_custom">Benutzerdefinierte Datenschutz-Einstellungen werden angewendet</string> - <string name="quickprivacy_disabled_message">Die Änderungen werden erst beim Aktivieren des Datenschutz-Schalters angewandt.</string> <string name="close">Schließen</string> <string name="dashboard_first_ipscrambling_activation">Das Verschleiern deiner IP wird möglicherweise die Internetgeschwindigkeit verlangsamen.</string> <string name="widget_state_title_custom">Benutzerdefinierte Datenschutz-Einstellungen werden angewandt</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 9cbe21c..213a9d7 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="dashboard_state_trackers_label">Rastreadores:</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> - <string name="dashboard_state_geolocation_label">Ubicación:</string> + <string name="dashboard_state_geolocation_label">Ubicación</string> <string name="dashboard_state_geolocation_off">Expuesto</string> <string name="dashboard_state_geolocation_on">Falso</string> - <string name="dashboard_state_ipaddress_label">Direccion IP real:</string> + <string name="dashboard_state_ipaddress_label">Direccion IP real</string> <string name="dashboard_state_ipaddress_off">Expuesto</string> <string name="dashboard_state_ipaddress_on">Oculto</string> <string name="dashboard_graph_label">Filtración de datos personales</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 0964d3f..b5932de 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -90,17 +90,16 @@ <string name="dashboard_graph_label">Henkilötietojen vuoto:</string> <string name="dashboard_state_ipaddress_on">Piilotettu</string> <string name="dashboard_state_ipaddress_off">Paljastettu</string> - <string name="dashboard_state_ipaddress_label">Todellinen IP-osoite:</string> + <string name="dashboard_state_ipaddress_label">Todellinen IP-osoite</string> <string name="dashboard_state_geolocation_on">Väärennetty</string> <string name="dashboard_state_geolocation_off">Paljastettu</string> - <string name="dashboard_state_geolocation_label">Sijainti:</string> + <string name="dashboard_state_geolocation_label">Sijainti</string> <string name="dashboard_state_trackers_on">Estetty</string> <string name="dashboard_state_trackers_off">Haavoittuvainen</string> - <string name="dashboard_state_trackers_label">Seuraimet:</string> + <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="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> <string name="graph_legend_allowed">Sallittuja tietovuotoja</string> <string name="graph_legend_blocked">Estettyjä tietovuotoja</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 628cff3..b4db80f 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2,13 +2,13 @@ <resources> <string name="dashboard_state_title_on">Votre vie privée en ligne est protégée</string> <string name="dashboard_state_title_off">Votre vie privée en ligne n\'est pas protégée</string> - <string name="dashboard_state_trackers_label">Trackers :</string> + <string name="dashboard_state_trackers_label">Trackers</string> <string name="dashboard_state_trackers_off">Vulnérable</string> <string name="dashboard_state_trackers_on">Refusé</string> - <string name="dashboard_state_geolocation_label">Localisation :</string> + <string name="dashboard_state_geolocation_label">Localisation</string> <string name="dashboard_state_geolocation_off">Exposé</string> <string name="dashboard_state_geolocation_on">Faux</string> - <string name="dashboard_state_ipaddress_label">Adresse IP réelle :</string> + <string name="dashboard_state_ipaddress_label">Adresse IP réelle</string> <string name="dashboard_state_ipaddress_off">Exposé</string> <string name="dashboard_graph_label">Fuite de données personnelles :</string> <string name="dashboard_graph_period">Aujourd\'hui</string> @@ -96,7 +96,6 @@ <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> - <string name="quickprivacy_disabled_message">Les modifications seront effectives uniquement quand la protection de la confidentialité sera activée.</string> <string name="dashboard_first_ipscrambling_activation">Votre vitesse Internet risque d\'être réduite tant que votre adresse IP est masquée.</string> <string name="graph_legend_allowed">Fuites autorisées</string> <string name="graph_legend_blocked">Fuites bloquées</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9f8d02d..316aa4f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="dashboard_state_title_off">La tua privacy online non è protetta</string> - <string name="dashboard_state_trackers_label">Tracker:</string> + <string name="dashboard_state_trackers_label">Tracker</string> <string name="dashboard_state_trackers_off">Vulnerabile</string> <string name="dashboard_state_trackers_on">Negato</string> - <string name="dashboard_state_geolocation_label">Posizione:</string> + <string name="dashboard_state_geolocation_label">Posizione</string> <string name="dashboard_state_geolocation_off">Esposta</string> <string name="dashboard_state_geolocation_on">Fasulla</string> - <string name="dashboard_state_ipaddress_label">Indirizzo IP reale:</string> + <string name="dashboard_state_ipaddress_label">Indirizzo IP reale</string> <string name="dashboard_state_ipaddress_off">Esposto</string> <string name="dashboard_state_ipaddress_on">Nascosto</string> <string name="dashboard_graph_label">Fuga di dati personali:</string> @@ -110,7 +110,6 @@ <string name="dashboard_graph_leaking_app">Guarda</string> <string name="dashboard_state_title_custom">Impostazioni della privacy personalizzate applicate</string> <string name="close">Chiudi</string> - <string name="quickprivacy_disabled_message">I cambiamenti avranno efficacia solo dopo l\'abilitazione del pulsante protezione privacy.</string> <string name="graph_subtitle">Tocca le barre per maggiori informazioni.</string> <string name="graph_legend_allowed">Perdite di dati ammesse</string> <string name="graph_legend_blocked">Perdite di dati bloccate</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8705ac5..a4d1040 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,21 +8,20 @@ <string name="graph_legend_blocked">Blocked leaks</string> <string name="graph_legend_allowed">Allowed leaks</string> <string name="graph_subtitle">Tap on the bars for more information.</string> - <string name="quickprivacy_disabled_message">Changes will only be effective when privacy protection toggle is enabled.</string> <string name="close">Close</string> <!-- Dashboard --> <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> - <string name="dashboard_state_trackers_label">Trackers:</string> + <string name="dashboard_state_trackers_label">Trackers</string> <string name="dashboard_state_trackers_off">Vulnerable</string> <string name="dashboard_state_trackers_on">Denied</string> <string name="dashboard_state_trackers_custom">Custom</string> - <string name="dashboard_state_geolocation_label">Location:</string> + <string name="dashboard_state_geolocation_label">Location</string> <string name="dashboard_state_geolocation_off">Exposed</string> <string name="dashboard_state_geolocation_on">Fake</string> - <string name="dashboard_state_ipaddress_label">Real IP address:</string> + <string name="dashboard_state_ipaddress_label">Real IP address</string> <string name="dashboard_state_ipaddress_off">Exposed</string> <string name="dashboard_state_ipaddress_on">Hidden</string> <string name="dashboard_graph_label">Personal data leakage:</string> @@ -87,6 +86,7 @@ <string name="apptrackers_error_quickprivacy_disabled">Enable Quick Privacy to be able to activate/deactivate trackers.</string> <string name="apptrackers_trackers_count_summary">%1$d blocked trackers out of %2$d detected trackers, %3$d blocked leaks and %4$d allowed leaks.</string> <string name="apptrackers_error_no_app">App not installed.</string> + <string name="apptrackers_tracker_control_disabled_message">Changes will take effect when tracker blocker is on.</string> <!-- --> <string name="quick_protection_info">Quick protection enables these settings when turned on</string> <string name="quick_protection_settings_list"> - All trackers are turned off.\n- Your geolocation will be faked.\n- Your real IP address will be hidden.</string> |