From 4c7cfa6d5af8027a6cbd6a5c8f57935c29637797 Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 17 Aug 2016 14:44:01 -0700 Subject: [PATCH] Various updates to Guide files. --- .idea/dictionaries/soren.xml | 1 + .../{guide_tracking_uids.html => guide_tracking_ids.html} | 0 app/src/main/assets/en/about_contributors.html | 2 ++ app/src/main/assets/en/guide_tor.html | 7 ++++--- .../{guide_tracking_uids.html => guide_tracking_ids.html} | 0 .../java/com/stoutner/privacybrowser/GuideActivity.java | 2 +- .../java/com/stoutner/privacybrowser/GuideTabFragment.java | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 9 files changed, 11 insertions(+), 7 deletions(-) rename app/src/main/assets/de/{guide_tracking_uids.html => guide_tracking_ids.html} (100%) rename app/src/main/assets/en/{guide_tracking_uids.html => guide_tracking_ids.html} (100%) diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 69d16eb2..1aea9cb6 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -22,6 +22,7 @@ edittext exynos favoriteicon + gerlach intl isfolder khtml diff --git a/app/src/main/assets/de/guide_tracking_uids.html b/app/src/main/assets/de/guide_tracking_ids.html similarity index 100% rename from app/src/main/assets/de/guide_tracking_uids.html rename to app/src/main/assets/de/guide_tracking_ids.html diff --git a/app/src/main/assets/en/about_contributors.html b/app/src/main/assets/en/about_contributors.html index 81b4c238..da65ea02 100644 --- a/app/src/main/assets/en/about_contributors.html +++ b/app/src/main/assets/en/about_contributors.html @@ -33,6 +33,8 @@

Contributors

+Aaron Gerlach: German Translation +

Contributors are welcome to submit both code and translations.

\ No newline at end of file diff --git a/app/src/main/assets/en/guide_tor.html b/app/src/main/assets/en/guide_tor.html index dabec0ac..db433a70 100644 --- a/app/src/main/assets/en/guide_tor.html +++ b/app/src/main/assets/en/guide_tor.html @@ -39,11 +39,12 @@

VPN services can mask a device's IP address from a web server. When a VPN service is engaged, all traffic is encrypted and routed through the VPN server. The web server only sees the IP address of the VPN server. This is sufficient for maintaining anonymity - from web server operators and advertisers, but it isn't sufficient for maintaining anonymity from oppressive regimes which might + from web server operators and advertisers, as well as accessing websites (like some music and video streaming services) that + intentionally block access from particular countries, but it isn't sufficient for maintaining anonymity from oppressive regimes which might be able to lean on VPN operators to turn over their logs showing the original IP addresses. Those looking for safety from such regimes or desiring to blow the whistle on government agencies need something more.

-

The Tor (The Onion Router) network was designed for just such purposes. It bounces encrypted web traffic through at least three independent servers +

The TOR (The Onion Router) network was designed for just such purposes. It bounces encrypted web traffic through at least three independent servers that volunteer bandwidth to the project. None of the servers have enough information to identify both the IP address of the original computer and the final destination. Therefore, any government agency wanting to access the information would have to compromise all the machines in the link, which are dispersed over the globe. This doesn't provide perfect privacy, but it gets pretty close.

@@ -64,6 +65,6 @@

Currently, Privacy Browser works with Orbot in transparent proxy and VPN modes. Support for the standard proxy mode will be added in a future release.

-

Because traffic is being routed through several Tor nodes, using Tor is often much slower than going straight to the internet.

+

Because traffic is being routed through several Tor nodes, using Tor is often much slower than connecting straight to the internet.

\ No newline at end of file diff --git a/app/src/main/assets/en/guide_tracking_uids.html b/app/src/main/assets/en/guide_tracking_ids.html similarity index 100% rename from app/src/main/assets/en/guide_tracking_uids.html rename to app/src/main/assets/en/guide_tracking_ids.html diff --git a/app/src/main/java/com/stoutner/privacybrowser/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/GuideActivity.java index df8f812e..078d50bd 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/GuideActivity.java @@ -86,7 +86,7 @@ public class GuideActivity extends AppCompatActivity { return getString(R.string.tor); case 5: - return getString(R.string.tracking_uids); + return getString(R.string.tracking_ids); case 6: return getString(R.string.clear_and_exit); diff --git a/app/src/main/java/com/stoutner/privacybrowser/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/GuideTabFragment.java index 39a3e454..4fa96779 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/GuideTabFragment.java @@ -77,7 +77,7 @@ public class GuideTabFragment extends Fragment { break; case 5: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_uids.html"); + tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids.html"); break; case 6: diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ba15192a..945ebade 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -116,7 +116,7 @@ Übersicht Lokale Speicherung Tor - Verolgungs-UIDs + Verolgungs-IDs Geplante Features diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 29bb000a..d6cb1a4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -111,7 +111,7 @@ Overview Local Storage Tor - Tracking UIDs + Tracking IDs Planned Features -- 2.43.0