From 3bd71cebfddb14b7adcbb39c5ab98f9ce90f8d9d Mon Sep 17 00:00:00 2001
From: Soren Stoutner <soren@stoutner.com>
Date: Fri, 25 Nov 2016 15:49:11 -0700
Subject: [PATCH] Initial (partial) Spanish translation.

---
 app/src/free/res/values-es/strings.xml        | 24 ++++++++++
 .../activities/MainWebView.java               | 19 ++++----
 app/src/main/res/values-de/strings.xml        |  4 +-
 app/src/main/res/values-es/strings.xml        | 45 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 +-
 5 files changed, 81 insertions(+), 15 deletions(-)
 create mode 100644 app/src/free/res/values-es/strings.xml
 create mode 100644 app/src/main/res/values-es/strings.xml

diff --git a/app/src/free/res/values-es/strings.xml b/app/src/free/res/values-es/strings.xml
new file mode 100644
index 00000000..01319a18
--- /dev/null
+++ b/app/src/free/res/values-es/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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/>. -->
+
+<resources>
+    <!-- Activities. -->
+    <string name="privacy_browser">Navegador Privado Gratis</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
index aeb8756a..5ac470bb 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/activities/MainWebView.java
@@ -431,7 +431,7 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN
         });
 
         // drawerToggle creates the hamburger icon at the start of the AppBar.
-        drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation, R.string.close_navigation);
+        drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, supportAppBar, R.string.open_navigation_drawer, R.string.close_navigation_drawer);
 
         mainWebView.setWebViewClient(new WebViewClient() {
             // `shouldOverrideUrlLoading` makes this `WebView` the default handler for URLs inside the app, so that links are not kicked out to other apps.
@@ -439,7 +439,7 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN
             @SuppressWarnings("deprecation")
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                // Use an external email program if the link begins with "mailto:".
+                // Use an external email program if the link begins with `mailto:`.
                 if (url.startsWith("mailto:")) {
                     // We use `ACTION_SENDTO` instead of `ACTION_SEND` so that only email programs are launched.
                     Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
@@ -1165,16 +1165,13 @@ public class MainWebView extends AppCompatActivity implements NavigationView.OnN
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        // Handle the `adView` for the free version.
-        if (BuildConfig.FLAVOR.contentEquals("free")) {
-            // Reload the ad if we are not in full screen mode.
-            if (adView.isShown() && !fullScreenVideoFrameLayout.isShown()) {
-                // Reload the ad.
-                BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
+        // Reload the ad for the free flavor if we are not in full screen mode.
+        if (BuildConfig.FLAVOR.contentEquals("free") && adView.isShown() && !fullScreenVideoFrameLayout.isShown()) {
+            // Reload the ad.
+            BannerAd.reloadAfterRotate(adView, getApplicationContext(), getString(R.string.ad_id));
 
-                // Reinitialize the `adView` variable, as the `View` will have been removed and re-added by `BannerAd.reloadAfterRotate()`.
-                adView = findViewById(R.id.adView);
-            }
+            // Reinitialize the `adView` variable, as the `View` will have been removed and re-added by `BannerAd.reloadAfterRotate()`.
+            adView = findViewById(R.id.adView);
         }
 
         // `invalidateOptionsMenu` should recalculate the number of action buttons from the menu to display on the app bar, but it doesn't because of the this bug:  https://code.google.com/p/android/issues/detail?id=20493#c8
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 18d64f1d..26f9482a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -43,8 +43,8 @@
     <string name="form_data_disabled">Formulardaten deaktiviert</string>
     <string name="cookies_deleted">Cookies gelöscht</string>
     <string name="dom_storage_deleted">DOM-Speicher gelöscht</string>
-    <string name="open_navigation">Navigationspanel öffnen</string>
-    <string name="close_navigation">Navigationspanel schließen</string>
+    <string name="open_navigation_drawer">Navigationspanel öffnen</string>
+    <string name="close_navigation_drawer">Navigationspanel schließen</string>
 
     <!-- Save As. -->
     <string name="save_as">Speichern unter</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..09cc8c34
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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/>. -->
+
+<!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
+
+<resources>
+    <!-- Activities. -->
+    <string name="privacy_browser">Navegador Privado</string>
+    <string name="privacy_browser_settings">Navegador Privado Configuración</string>
+    <!-- <string name="android_asset_path">es</string>  -->  <!-- For translations, this should be the localization abbreviation.  For example, Spanish is `es`. -->
+
+    <!-- MainWebView. -->
+    <string name="privacy_mode">Modo Privado</string>
+    <string name="javascript_enabled">JavaScript habilitado</string>
+    <string name="javascript_disabled">JavaScript deshabilitado</string>
+    <string name="first_party_cookies_enabled">Cookies de primeras partes habilitadas</string>
+    <string name="first_party_cookies_disabled">Cookies de primeras partes deshabilitadas</string>
+    <string name="third_party_cookies_enabled">Cookies de terceras partes habilitadas</string>
+    <string name="third_party_cookies_disabled">Cookies de terceras partes deshabilitadas</string>
+    <string name="dom_storage_enabled">Almacén de DOM habilitado</string>
+    <string name="dom_storage_disabled">Almacén de DOM deshabilitado</string>
+    <string name="form_data_enabled">Datos del formulario habilitado</string>
+    <string name="form_data_disabled">Datos del fromulario deshabilitado</string>
+    <string name="cookies_deleted">Cookies borradas</string>
+    <string name="dom_storage_deleted">Almacén de DOM borrado</string>
+    <string name="open_navigation_drawer">Abrir el Cajón de Navigación</string>
+    <string name="close_navigation_drawer">Cerrar el Cajón de Navigación</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95e98993..19ecf961 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,8 +42,8 @@
     <string name="form_data_disabled">Form Data disabled</string>
     <string name="cookies_deleted">Cookies deleted</string>
     <string name="dom_storage_deleted">DOM Storage deleted</string>
-    <string name="open_navigation">Open Navigation Drawer</string>
-    <string name="close_navigation">Close Navigation Drawer</string>
+    <string name="open_navigation_drawer">Open Navigation Drawer</string>
+    <string name="close_navigation_drawer">Close Navigation Drawer</string>
 
     <!-- Save As. -->
     <string name="save_as">Save as</string>
-- 
2.45.2