From: Soren Stoutner Date: Wed, 31 May 2017 20:43:52 +0000 (-0700) Subject: Remove `Clear and Exit` and `Planned Features` from the Guide. X-Git-Tag: v2.4~17 X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=commitdiff_plain;h=2b15a4595039d5f8a5269cb990805b6e15f8613f;hp=4d7e0bfa2399670591dc585f94a976b904787a9d Remove `Clear and Exit` and `Planned Features` from the Guide. --- diff --git a/app/src/main/assets/de/guide_clear_and_exit.html b/app/src/main/assets/de/guide_clear_and_exit.html deleted file mode 100644 index 4e521324..00000000 --- a/app/src/main/assets/de/guide_clear_and_exit.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - -

Den überflüssigen Inhalt leeren

- -

Leeren und Beenden bewirkt Folgendes:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/de/guide_planned_features.html b/app/src/main/assets/de/guide_planned_features.html deleted file mode 100644 index 5c235759..00000000 --- a/app/src/main/assets/de/guide_planned_features.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Das Beste kommt erst noch

- -

Privacy Browser ist noch unfertig. Die allerbesten Features werden erst noch mit eingebunden. Sie beinhalten Folgendes:

- - - -

Eine umfangreichere Liste aller geplanten Features und Fehler ist unter redmine.stoutner.com verfügbar.

- - \ No newline at end of file diff --git a/app/src/main/assets/de/guide_tor.html b/app/src/main/assets/de/guide_tor.html index 779b4a7e..3a1ceb3a 100644 --- a/app/src/main/assets/de/guide_tor.html +++ b/app/src/main/assets/de/guide_tor.html @@ -29,6 +29,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -40,7 +46,7 @@ -

Tor und seine Grenzen

+

Tor und seine Grenzen

Faktoren, die in die Privatsphäre im Web eindringen wollen lassen sich hauptsächlich in zwei verschiedene Kategorien unterteilen: Neugierige Behörden mit Zugriff auf Internetprovider und Megafirmen, die Soziale und Werbenetzwerke betreiben. diff --git a/app/src/main/assets/en/guide_clear_and_exit.html b/app/src/main/assets/en/guide_clear_and_exit.html deleted file mode 100644 index a0fdcf54..00000000 --- a/app/src/main/assets/en/guide_clear_and_exit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Cleaning Out the Cruft

- -

Clear and Exit does the following things:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/en/guide_planned_features.html b/app/src/main/assets/en/guide_planned_features.html deleted file mode 100644 index b1d81245..00000000 --- a/app/src/main/assets/en/guide_planned_features.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -

The Best Is Yet to Come

- -

Privacy Browser is still in its infancy. Most of the best features are yet to be implemented. They include the following:

- - - -

A full list of planned features and bug reports is available at redmine.stoutner.com.

- - \ 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 96a208c2..e73f1ada 100644 --- a/app/src/main/assets/en/guide_tor.html +++ b/app/src/main/assets/en/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor and Its Limits

+

Tor and Its Limits

There are two general categories of bad actors that want to infringe on the privacy of the web: malicious governments with access to ISPs (Internet Service Providers) and mega corporations that run social and advertising networks. TOR (The Onion Router) is useful in protecting privacy from malicious governments (which spy on traffic in transit) but not from mega corporations (which embed malicious code on web servers).

diff --git a/app/src/main/assets/en/images/orbot_dark_blue.png b/app/src/main/assets/en/images/orbot_dark_blue.png new file mode 100644 index 00000000..70bc318f Binary files /dev/null and b/app/src/main/assets/en/images/orbot_dark_blue.png differ diff --git a/app/src/main/assets/es/guide_clear_and_exit.html b/app/src/main/assets/es/guide_clear_and_exit.html deleted file mode 100644 index 187ceef8..00000000 --- a/app/src/main/assets/es/guide_clear_and_exit.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -

Eliminar y salir

- -

Eliminar y salir hace lo siguiente:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/es/guide_planned_features.html b/app/src/main/assets/es/guide_planned_features.html deleted file mode 100644 index 18e1fc95..00000000 --- a/app/src/main/assets/es/guide_planned_features.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - -

Lo mejor está por venir

- -

Navegador Privado aún está en su infancia. La mayoría de sus mejores características están aún por implementar. Éstas incluyen lo siguiente:

- - - -

Una lista completa de características planeadas e informe de errores está disponible en redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/es/guide_tor.html b/app/src/main/assets/es/guide_tor.html index c104a0b3..1d84d916 100644 --- a/app/src/main/assets/es/guide_tor.html +++ b/app/src/main/assets/es/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor y sus límites

+

Tor y sus límites

Existen dos categorías generales de malos actores que quieren infringir la privacidad de la web: gobiernos maliciosos con acceso a ISPs (Proveedores de Servicios de Internet) y grandes corporaciones que ofrecen redes sociales y de publicidad. TOR (El Enrutador de Cebolla) es útil en proteger la privacidad de gobiernos maliciosos (que espían el tráfico en tránsito) pero no de grandes corporaciones (que incrustan código malicioso en los servidores web).

diff --git a/app/src/main/assets/it/guide_clear_and_exit.html b/app/src/main/assets/it/guide_clear_and_exit.html deleted file mode 100644 index b473cbe0..00000000 --- a/app/src/main/assets/it/guide_clear_and_exit.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -

Pulizia dei dati di navigazione

- -

Elimina Dati ed Esci esegue le seguenti azioni:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/it/guide_planned_features.html b/app/src/main/assets/it/guide_planned_features.html deleted file mode 100644 index 9b73574e..00000000 --- a/app/src/main/assets/it/guide_planned_features.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - -

Il meglio deve ancora venire

- -

Privacy Browser è ancora all'inzio dello sviluppo. La maggior parte delle migliori funzionalità deve essere ancora implementata, come ad esempio:

- - - -

Una lista completa delle funzionalità e dei bug è disponibile su redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/it/guide_tor.html b/app/src/main/assets/it/guide_tor.html index e9f0a284..78c125c9 100644 --- a/app/src/main/assets/it/guide_tor.html +++ b/app/src/main/assets/it/guide_tor.html @@ -28,6 +28,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -39,7 +45,7 @@ -

Tor e i suoi limiti

+

Tor e i suoi limiti

Esistono due categorie generali di cattivi soggetti che vogliono violare la privacy del web: governi maliziosi con accesso agli ISP (Internet Service Providers) e mega corporations che gestiscono social network e agenzie pubblicitarie. TOR (The Onion Router) è utile per proteggere la privacy dai governi maliziosi (che spiano il traffico in transito) ma non dalle mega corporations (che mettono codice maligno sui web server).

diff --git a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html b/app/src/main/assets/zh-rTW/guide_clear_and_exit.html deleted file mode 100644 index a0fdcf54..00000000 --- a/app/src/main/assets/zh-rTW/guide_clear_and_exit.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - -

Cleaning Out the Cruft

- -

Clear and Exit does the following things:

- - - - \ No newline at end of file diff --git a/app/src/main/assets/zh-rTW/guide_planned_features.html b/app/src/main/assets/zh-rTW/guide_planned_features.html deleted file mode 100644 index b1d81245..00000000 --- a/app/src/main/assets/zh-rTW/guide_planned_features.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - -

The Best Is Yet to Come

- -

Privacy Browser is still in its infancy. Most of the best features are yet to be implemented. They include the following:

- - - -

A full list of planned features and bug reports is available at redmine.stoutner.com.

- - \ No newline at end of file diff --git a/app/src/main/assets/zh-rTW/guide_tor.html b/app/src/main/assets/zh-rTW/guide_tor.html index be99b0b6..27cacb60 100644 --- a/app/src/main/assets/zh-rTW/guide_tor.html +++ b/app/src/main/assets/zh-rTW/guide_tor.html @@ -26,6 +26,12 @@ color: 0D4781; } + img.title { + vertical-align: bottom; + height: 32; + width: 32; + } + img.center { display: block; margin-left: auto; @@ -37,7 +43,7 @@ -

Tor and Its Limits

+

Tor and Its Limits

There are two general categories of bad actors that want to infringe on the privacy of the web: malicious governments with access to ISPs (Internet Service Providers) and mega corporations that run social and advertising networks. TOR (The Onion Router) is useful in protecting privacy from malicious governments (which spy on traffic in transit) but not from mega corporations (which embed malicious code on web servers).

diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java index ca7756e9..70907fca 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -66,7 +66,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 9; + return 7; } @Override @@ -94,12 +94,6 @@ public class GuideActivity extends AppCompatActivity { case 6: return getString(R.string.tracking_ids); - case 7: - return getString(R.string.clear_and_exit); - - case 8: - return getString(R.string.planned_features); - default: return ""; } diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java index 5925f8c9..a3b2249a 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java +++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/GuideTabFragment.java @@ -86,14 +86,6 @@ public class GuideTabFragment extends Fragment { case 6: tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_tracking_ids.html"); break; - - case 7: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_clear_and_exit.html"); - break; - - case 8: - tabWebView.loadUrl("file:///android_asset/" + getString(R.string.android_asset_path) + "/guide_planned_features.html"); - break; } return tabLayout;