From 2966380108d288327bc25301ab3f7283755196e6 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Thu, 25 Feb 2016 11:45:39 +0100
Subject: [PATCH] 0.94 stable

---
 app/build.gradle                           |  4 ++--
 app/src/main/res/values-de/strings.xml     |  4 ++--
 app/src/main/res/values-es/strings.xml     | 24 +++++++++++-----------
 app/src/main/res/values-fr/strings.xml     |  2 +-
 app/src/main/res/values-ja/strings.xml     |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml |  2 +-
 app/src/main/res/values-ro/strings.xml     |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1b786fda..741fa29e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ model {
             applicationId "eu.faircode.netguard"
             minSdkVersion.apiLevel 14
             targetSdkVersion.apiLevel 23
-            versionCode = 2016022301
-            versionName = "0.93-beta"
+            versionCode = 2016022501
+            versionName = "0.94"
             archivesBaseName = "NetGuard-v$versionName-$versionCode"
 
             buildConfigFields {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 103d0afb..98dc3a2a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -27,7 +27,7 @@
   <string name="menu_live">Live-Updates</string>
   <string name="menu_refresh">Aktualisieren</string>
   <string name="menu_resolve">Namen anzeigen</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">Organisation zeigen</string>
   <string name="menu_pcap_enabled">PCAP aktiviert</string>
   <string name="menu_pcap_export">PCAP exportieren</string>
   <string name="menu_clear">Bereinigen</string>
@@ -150,7 +150,7 @@
   <string name="title_host_blocked">Adresse ist blockiert</string>
   <string name="title_interactive_allowed">Erlauben, wenn Bildschirm an</string>
   <string name="title_roaming_blocked">Bei Roaming blockieren</string>
-  <string name="title_metered">Standardmäßig wird eine WLAN-Verbindung als ungemessen und eine mobile Verbindung als gemessen betrachtet</string>
+  <string name="title_metered">Standardmäßig wird eine WLAN-Verbindung als ungemessen und eine mobile Verbindung als gemessen betrachtet.</string>
   <string name="title_apply">Regeln und Bedingungen anwenden</string>
   <string name="title_conditions">Bedingungen</string>
   <string name="title_screen_wifi">WLAN erlauben, wenn Bildschirm eingeschaltet ist</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 21343a70..6b7b68e0 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -26,7 +26,7 @@
   <string name="menu_live">Actualizaciones en vivo</string>
   <string name="menu_refresh">Actualizar</string>
   <string name="menu_resolve">Mostrar nombres</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">Mostrar organización</string>
   <string name="menu_pcap_enabled">PCAP habilitado</string>
   <string name="menu_pcap_export">Exportar PCAP</string>
   <string name="menu_clear">Vaciar</string>
@@ -53,7 +53,7 @@
   <string name="setting_network_options">Opciones de red</string>
   <string name="setting_tethering">Permitir anclaje a red</string>
   <string name="setting_wifi_home">Red Wi-Fi hogareña: %1$s</string>
-  <string name="setting_metered">Gestionar redes Wi-Fi limitadas</string>
+  <string name="setting_metered">Gestionar redes Wi-Fi medidas</string>
   <string name="setting_metered_2g">Considerar 2G ilimitado</string>
   <string name="setting_metered_3g">Considerar 3G ilimitado</string>
   <string name="setting_metered_4g">Considerar LTE ilimitado</string>
@@ -93,7 +93,7 @@
   <string name="summary_delay">Después de apagar la pantalla, mantener la pantalla de reglas activas para el número seleccionado de minutos (ingrese cero para desactivar esta opción)</string>
   <string name="summary_tethering">No se puede filtrar el tráfico por anclaje</string>
   <string name="summary_wifi_home">Aplicar sólo reglas de red Wi-Fi en la red seleccionada (aplicar reglas de red móvil para otras redes Wi-Fi)</string>
-  <string name="summary_metered">Aplicar reglas de red móvil a redes Wi-Fi limitadas (pagas, por anclaje)</string>
+  <string name="summary_metered">Aplicar reglas de red móvil a redes Wi-Fi medidas (pagas, por anclaje)</string>
   <string name="summary_metered_2g">Aplicar reglas de red Wi-Fi para conexiones de datos 2G</string>
   <string name="summary_metered_3g">Aplicar reglas de red Wi-Fi para conexiones de datos 3G</string>
   <string name="summary_metered_4g">Aplicar reglas de red Wi-Fi para conexiones de datos LTE</string>
@@ -141,15 +141,15 @@
   <string name="msg_stop_forward">¿Parar reenvío del puerto %1$s, %2$d?</string>
   <string name="msg_metered">La red está medida</string>
   <string name="msg_queue">NetGuard está ocupado</string>
-  <string name="title_unmetered_allowed">Trafico no Medido Permitido</string>
-  <string name="title_unmetered_blocked">Trafico no Medido Bloqueado</string>
-  <string name="title_metered_allowed">Trafico Medido Permitido</string>
-  <string name="title_metered_blocked">Trafico Medido Bloqueado</string>
-  <string name="title_host_allowed">Dirección Permitida</string>
-  <string name="title_host_blocked">Dirección Bloqueada</string>
-  <string name="title_interactive_allowed">Permitir con Pantalla Encendida</string>
+  <string name="title_unmetered_allowed">Tráfico ilimitado permitido</string>
+  <string name="title_unmetered_blocked">Tráfico ilimitado bloqueado</string>
+  <string name="title_metered_allowed">Tráfico medido permitido</string>
+  <string name="title_metered_blocked">Tráfico medido bloqueado</string>
+  <string name="title_host_allowed">Dirección permitida</string>
+  <string name="title_host_blocked">Dirección bloqueada</string>
+  <string name="title_interactive_allowed">Permitir con la pantalla encendida</string>
   <string name="title_roaming_blocked">Bloquear en Roaming</string>
-  <string name="title_metered">By default a Wi-Fi connection is considered to be unmetered and a mobile connection to be metered</string>
+  <string name="title_metered">Por defecto, una conexión Wi-Fi se considera ilimitada y una conexión móvil medida</string>
   <string name="title_apply">Aplicar reglas y condiciones</string>
   <string name="title_conditions">Condiciones</string>
   <string name="title_screen_wifi">Permitir Wi-Fi con la pantalla encendida</string>
@@ -157,7 +157,7 @@
   <string name="title_roaming_symbol">R</string>
   <string name="title_roaming">Bloquear cuando esté en roaming</string>
   <string name="title_disabled">está desactivado</string>
-  <string name="title_internet">no tiene permiso a Internet</string>
+  <string name="title_internet">no tiene permiso a internet</string>
   <string name="title_related">Filtro relacionado</string>
   <string name="title_access">Intentos de acceso</string>
   <string name="title_no_log"><u>El registro está desactivado</u></string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 103c6364..2cd268cd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -26,7 +26,7 @@
   <string name="menu_live">Mises à jour en direct</string>
   <string name="menu_refresh">Actualiser</string>
   <string name="menu_resolve">Afficher les noms</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">Afficher l\'organisation</string>
   <string name="menu_pcap_enabled">PCAP activé</string>
   <string name="menu_pcap_export">Exporter PCAP</string>
   <string name="menu_clear">Effacer</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 3bc8fcc8..6e25bb5a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -27,7 +27,7 @@
   <string name="menu_live">ライブアップデート</string>
   <string name="menu_refresh">更新</string>
   <string name="menu_resolve">名前を表示</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">組織を表示</string>
   <string name="menu_pcap_enabled">PCAP を有効にしました</string>
   <string name="menu_pcap_export">PCAP エクスポート</string>
   <string name="menu_clear">クリア</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 14fcfb6f..540c7c3a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -27,7 +27,7 @@
   <string name="menu_live">Atualizações ao vivo</string>
   <string name="menu_refresh">Atualizar</string>
   <string name="menu_resolve">Mostrar nomes</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">Mostrar organização</string>
   <string name="menu_pcap_enabled">PCAP ativado</string>
   <string name="menu_pcap_export">Exportar PCAP</string>
   <string name="menu_clear">Limpar</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 1f272a88..16d63920 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -26,7 +26,7 @@
   <string name="menu_live">Actualizare in timp real</string>
   <string name="menu_refresh">Actualizare</string>
   <string name="menu_resolve">Arata nume domenii</string>
-  <string name="menu_organization">Show organization</string>
+  <string name="menu_organization">Arata organizatia</string>
   <string name="menu_pcap_enabled">Activeaza PCAP</string>
   <string name="menu_pcap_export">Exporta PCAP</string>
   <string name="menu_clear">Elimina</string>