From 3bd71cebfddb14b7adcbb39c5ab98f9ce90f8d9d Mon Sep 17 00:00:00 2001 From: Soren Stoutner 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 @@ + + + + + + + Navegador Privado Gratis + \ 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 @@ Formulardaten deaktiviert Cookies gelöscht DOM-Speicher gelöscht - Navigationspanel öffnen - Navigationspanel schließen + Navigationspanel öffnen + Navigationspanel schließen Speichern unter 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 @@ + + + + + + + + + Navegador Privado + Navegador Privado Configuración + + + + Modo Privado + JavaScript habilitado + JavaScript deshabilitado + Cookies de primeras partes habilitadas + Cookies de primeras partes deshabilitadas + Cookies de terceras partes habilitadas + Cookies de terceras partes deshabilitadas + Almacén de DOM habilitado + Almacén de DOM deshabilitado + Datos del formulario habilitado + Datos del fromulario deshabilitado + Cookies borradas + Almacén de DOM borrado + Abrir el Cajón de Navigación + Cerrar el Cajón de Navigación + \ 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 @@ Form Data disabled Cookies deleted DOM Storage deleted - Open Navigation Drawer - Close Navigation Drawer + Open Navigation Drawer + Close Navigation Drawer Save as -- 2.45.2