<w>edittext</w>
<w>exynos</w>
<w>favoriteicon</w>
+ <w>gerlach</w>
<w>intl</w>
<w>isfolder</w>
<w>khtml</w>
--- /dev/null
+<!--
+ Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+ Translation 2016 Aaron Gerlach <aaron@gerlach.com>. Copyright assigned to Soren Stoutner <soren@stoutner.com>.
+
+ Diese Datei ist Teil von Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+ Privacy Browser ist eine kostenlose Software: Sie können sie
+ unter den Bedingungen der GNU General Public License weiterverteilen
+ mit Berufung auf die veröffentlichte Fassung der Free Software
+ Foundation, entweder Version 3 der Lizenz oder (nach Ihrer
+ Möglichkeit) jede neuere Version.
+
+ Privacy Browser wird in der Hoffnung vertrieben nützlich zu sein,
+ jedoch OHNE JEGLICHE GARANTIE; auch ohne die implizierte
+ Garantie auf MARKTGÄNGLICHKEIT oder BEREITSCHAFT FÜR
+ BESTIMMTE ANWENDUNGEN. Nutzen Sie die GNU General Public
+ License für mehr Details.
+
+ Sie sollten eine Kopie der GNU General Public License zusammen mit
+ Privacy Browser erhalten haben. Wenn nicht, besuchen Sie
+ <http://www.gnu.org/licenses/>. -->
+
+<html>
+<head>
+ <style>
+ h3 {
+ color: 0D4781;
+ }
+
+ img.center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ </style>
+</head>
+
+<body>
+<h3>Werbung</h3>
+
+<p>Privacy Browser Free beinhaltet eine Bannerwerbung unten auf dem Bildschirm, welcher von Googles
+ AdMob-Netzwerk befüllt wird. Standardmäßig stellt Google die <a href="https://support.google.com/googleplay/android-developer/answer/6048248?hl=en">Werbe-ID</a>
+ des Geräts den Werbungen über dieses Netzwerk zur Verfügung. Das ermöglicht werbenden Firmen, ein Profil von
+ dem Gerät anzulegen, welches zeigt welche Apps installiert sind (welche auch Werbungen zeigen), wie oft sie genutzt werden und an welchen Werbungen der Nutzer interessiert ist.</p>
+
+<p>Benutzer können diese Werbe-ID deaktivieren in <strong>Einstellungen</strong>, <strong>Google</strong>, <strong>Werbung</strong>.</p>
+
+<img class="center" src="images/advertising_id.png" height="640" width="360">
+
+<p>Der Zweck der kostenlosen Version von Privacy Browser ist es, Nutzern zu ermöglichen, die Features der App zu testen. Die Standardversion kann in den bekannten App-Stores
+ gekauft oder kostenlos von
+ <a href="https://f-droid.org/repository/browse/?fdfilter=privacy+browser&fdid=com.stoutner.privacybrowser.standard">F-Droid</a> bezogen werden.</p>
+
+
+<h3>Verizon Tracking Headers</h3>
+
+<p>Verizon, einer der großen Mobilfunkbetreiber in den USA, fügt einen einmaligen Tracking Header zu sämtlichem HTTP-Datenverkehr über ihr Netzwerk hinzu. Die Electronic Frontier
+ Foundation hat über die <a href="https://www.eff.org/deeplinks/2014/11/verizon-x-uidh">Einschränkungen in der Privatsphäre bei diesem Vorgehen</a> berichtet. Aufgrund des öffentlichen Drucks
+ hat Verizon eine Möglichkeit geschaffen, <a href="http://www.clark.com/how-opt-out-verizons-super-cookie-tracking">sich von diesem Tracking abzumelden</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
+++ /dev/null
-<!--
- Copyright 2016 Soren Stoutner <soren@stoutner.com>.
-
- Translation 2016 Aaron Gerlach <aaron@gerlach.com>. Copyright assigned to Soren Stoutner <soren@stoutner.com>.
-
- Diese Datei ist Teil von Privacy Browser <https://www.stoutner.com/privacy-browser>.
-
- Privacy Browser ist eine kostenlose Software: Sie können sie
- unter den Bedingungen der GNU General Public License weiterverteilen
- mit Berufung auf die veröffentlichte Fassung der Free Software
- Foundation, entweder Version 3 der Lizenz oder (nach Ihrer
- Möglichkeit) jede neuere Version.
-
- Privacy Browser wird in der Hoffnung vertrieben nützlich zu sein,
- jedoch OHNE JEGLICHE GARANTIE; auch ohne die implizierte
- Garantie auf MARKTGÄNGLICHKEIT oder BEREITSCHAFT FÜR
- BESTIMMTE ANWENDUNGEN. Nutzen Sie die GNU General Public
- License für mehr Details.
-
- Sie sollten eine Kopie der GNU General Public License zusammen mit
- Privacy Browser erhalten haben. Wenn nicht, besuchen Sie
- <http://www.gnu.org/licenses/>. -->
-
-<html>
-<head>
- <style>
- h3 {
- color: 0D4781;
- }
-
- img.center {
- display: block;
- margin-left: auto;
- margin-right: auto;
- }
- </style>
-</head>
-
-<body>
-<h3>Werbung</h3>
-
-<p>Privacy Browser Free beinhaltet eine Bannerwerbung unten auf dem Bildschirm, welcher von Googles
- AdMob-Netzwerk befüllt wird. Standardmäßig stellt Google die <a href="https://support.google.com/googleplay/android-developer/answer/6048248?hl=en">Werbe-ID</a>
- des Geräts den Werbungen über dieses Netzwerk zur Verfügung. Das ermöglicht werbenden Firmen, ein Profil von
- dem Gerät anzulegen, welches zeigt welche Apps installiert sind (welche auch Werbungen zeigen), wie oft sie genutzt werden und an welchen Werbungen der Nutzer interessiert ist.</p>
-
-<p>Benutzer können diese Werbe-ID deaktivieren in <strong>Einstellungen</strong>, <strong>Google</strong>, <strong>Werbung</strong>.</p>
-
-<img class="center" src="images/advertising_id.png" height="640" width="360">
-
-<p>Der Zweck der kostenlosen Version von Privacy Browser ist es, Nutzern zu ermöglichen, die Features der App zu testen. Die Standardversion kann in den bekannten App-Stores
- gekauft oder kostenlos von
- <a href="https://f-droid.org/repository/browse/?fdfilter=privacy+browser&fdid=com.stoutner.privacybrowser.standard">F-Droid</a> bezogen werden.</p>
-
-
-<h3>Verizon Tracking Headers</h3>
-
-<p>Verizon, einer der großen Mobilfunkbetreiber in den USA, fügt einen einmaligen Tracking Header zu sämtlichem HTTP-Datenverkehr über ihr Netzwerk hinzu. Die Electronic Frontier
- Foundation hat über die <a href="https://www.eff.org/deeplinks/2014/11/verizon-x-uidh">Einschränkungen in der Privatsphäre bei diesem Vorgehen</a> berichtet. Aufgrund des öffentlichen Drucks
- hat Verizon eine Möglichkeit geschaffen, <a href="http://www.clark.com/how-opt-out-verizons-super-cookie-tracking">sich von diesem Tracking abzumelden</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
<h3>Contributors</h3>
+<a href="mailto:aaron@gerlach.com">Aaron Gerlach</a>: German Translation
+
<p>Contributors are welcome to submit both <a href="https://www.stoutner.com/privacy-browser/contributors/">code and translations</a>.</p>
</body>
</html>
\ No newline at end of file
<p>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.</p>
-<p>The Tor (The Onion Router) network was designed for just such purposes. It bounces encrypted web traffic through at least three independent servers
+<p>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.</p>
<p>Currently, Privacy Browser works with Orbot in transparent proxy and VPN modes. Support for the standard proxy mode will be added in a
<a href="https://redmine.stoutner.com/issues/26">future release</a>.</p>
-<p>Because traffic is being routed through several Tor nodes, using Tor is often much slower than going straight to the internet.</p>
+<p>Because traffic is being routed through several Tor nodes, using Tor is often much slower than connecting straight to the internet.</p>
</body>
</html>
\ No newline at end of file
--- /dev/null
+<!--
+ Copyright 2016 Soren Stoutner <soren@stoutner.com>.
+
+ This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+ Privacy Browser is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Privacy Browser is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
+
+<html>
+<head>
+<style>
+ h3 {
+ color: 0D4781;
+ }
+
+ img.center {
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
+</style>
+</head>
+
+<body>
+<h3>Advertisements</h3>
+
+<p>Privacy Browser Free includes a banner advertisement across the bottom of the screen that is populated by Google's
+ AdMob network. By default, Google provides the <a href="https://support.google.com/googleplay/android-developer/answer/6048248?hl=en">advertising ID</a>
+ of the device to the ads displayed through this network. This allows advertising companies to build a profile of
+ the device that show which apps are installed (that display ads), how often they are used, and which ads the user is interested in.</p>
+
+<p>Users can choose to disable the advertising ID in <strong>Settings</strong>, <strong>Google</strong>, <strong>Ads</strong>.</p>
+
+<img class="center" src="images/advertising_id.png" height="640" width="360">
+
+<p>The purpose of the free version of Privacy Browser is to allow people to test the features of the app. The standard version can be purchased
+ on the major app stores or downloaded for free from
+ <a href="https://f-droid.org/repository/browse/?fdfilter=privacy+browser&fdid=com.stoutner.privacybrowser.standard">F-Droid</a>.</p>
+
+
+<h3>Verizon Tracking Headers</h3>
+
+<p>Verizon, one of the major mobile carriers in the United States, adds a unique tracking header to all HTTP traffic on their network. The Electronic Frontier
+ Foundation has written about the <a href="https://www.eff.org/deeplinks/2014/11/verizon-x-uidh">privacy implications of this practice</a>. Due to public pressure
+ Verizon has created a way to <a href="http://www.clark.com/how-opt-out-verizons-super-cookie-tracking">opt out of this tracking</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
+++ /dev/null
-<!--
- Copyright 2016 Soren Stoutner <soren@stoutner.com>.
-
- This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
-
- Privacy Browser is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Privacy Browser is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
-
-<html>
-<head>
-<style>
- h3 {
- color: 0D4781;
- }
-
- img.center {
- display: block;
- margin-left: auto;
- margin-right: auto;
- }
-</style>
-</head>
-
-<body>
-<h3>Advertisements</h3>
-
-<p>Privacy Browser Free includes a banner advertisement across the bottom of the screen that is populated by Google's
- AdMob network. By default, Google provides the <a href="https://support.google.com/googleplay/android-developer/answer/6048248?hl=en">advertising ID</a>
- of the device to the ads displayed through this network. This allows advertising companies to build a profile of
- the device that show which apps are installed (that display ads), how often they are used, and which ads the user is interested in.</p>
-
-<p>Users can choose to disable the advertising ID in <strong>Settings</strong>, <strong>Google</strong>, <strong>Ads</strong>.</p>
-
-<img class="center" src="images/advertising_id.png" height="640" width="360">
-
-<p>The purpose of the free version of Privacy Browser is to allow people to test the features of the app. The standard version can be purchased
- on the major app stores or downloaded for free from
- <a href="https://f-droid.org/repository/browse/?fdfilter=privacy+browser&fdid=com.stoutner.privacybrowser.standard">F-Droid</a>.</p>
-
-
-<h3>Verizon Tracking Headers</h3>
-
-<p>Verizon, one of the major mobile carriers in the United States, adds a unique tracking header to all HTTP traffic on their network. The Electronic Frontier
- Foundation has written about the <a href="https://www.eff.org/deeplinks/2014/11/verizon-x-uidh">privacy implications of this practice</a>. Due to public pressure
- Verizon has created a way to <a href="http://www.clark.com/how-opt-out-verizons-super-cookie-tracking">opt out of this tracking</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
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);
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:
<string name="overview">Übersicht</string>
<string name="local_storage">Lokale Speicherung</string>
<string name="tor">Tor</string>
- <string name="tracking_uids">Verolgungs-UIDs</string>
+ <string name="tracking_ids">Verolgungs-IDs</string>
<string name="planned_features">Geplante Features</string>
<!-- Preferences. -->
<string name="overview">Overview</string>
<string name="local_storage">Local Storage</string>
<string name="tor">Tor</string>
- <string name="tracking_uids">Tracking UIDs</string>
+ <string name="tracking_ids">Tracking IDs</string>
<string name="planned_features">Planned Features</string>
<!-- Preferences. -->
projects / PrivacyBrowserAndroid.git / commitdiff