From 0c6462f5a0451d632a600bd06f2f9d297d4a03a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 7 Apr 2015 12:01:25 +0200
Subject: Traducidos strings normales.

---
 app/src/main/res/values-es/strings.xml | 82 ++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 8 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index ec8c21ff..249a9720 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,11 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="info">información</string>
-  <string name="show_connection_details">Mostrar detalles de la conexión</string>
-  <string name="routes_info">Rutas: %s</string>
-  <string name="routes_info6">Rutas IPv6: %s</string>
-  <string name="error_empty_username">El nombre de usuario no debe estar vacío.</string>
-  <string name="cert_from_keystore">Conseguido el certificado de \'%s\' de almacén de claves</string>
-  <string name="repository_url_text">Código fuente disponible en https://github.com/leapcode/bitmask_android/</string>
-  <string name="leap_tracker">Tracker disponible en https://leap.se/code</string>
+  
+
+    <string name="retry">Reintentar</string>
+    <string name="translation_project_text">Traducciones son bienvenidas. Puedes ir a nuestra página de Transifex: https://www.transifex.com/projects/p/bitmask-android/</string>
+    <string name="switch_provider_menu_option">Cambiar de proveedor</string>
+    <string name="info">información</string>
+    <string name="show_connection_details">Mostrar detalles de la conexión</string>
+    <string name="routes_info">Rutas: %s</string>
+    <string name="routes_info6">Rutas IPv6: %s</string>
+    <string name="error_empty_username">El usuario no puede estar vacío.</string>
+    <string name="cert_from_keystore">Certificado de \'%s\' obtenido de almacén de claves</string>
+    <string name="repository_url_text">Código fuente disponible en https://github.com/leapcode/bitmask_android/</string>
+    <string name="leap_tracker">Tracker disponible en https://leap.se/code</string>
+    <string name="title_activity_dashboard">Bitmask</string>
+    <string name="provider_label">Proveedor:</string>
+    <string name="provider_label_none">Ningún proveedor configurado</string>
+    <string name="status_unknown">Estado no definido.</string>
+    <string name="eip_service_label">Acceso a Internet Encriptado</string>
+    <string name="configuration_wizard_title">Elige un proveedor</string>
+    <string name="new_provider_button">Nuevo proveedor</string>
+    <string name="introduce_new_provider">Añadir un nuevo proveedor</string>
+    <string name="save">Guardar</string>
+    <string name="new_provider_uri">Dominio</string>
+    <string name="valid_url_entered">El dominio está bien formado</string>
+    <string name="not_valid_url_entered">Dominio no válido</string>
+    <string name="provider_details_fragment_title">Detalles del proveedor</string>
+    <string name="use_anonymously_button">Utilizar sin registrarse</string>
+    <string name="username_hint">usuario</string>
+    <string name="username_ask">Por favor, introduce tu usuario</string>
+    <string name="password_hint">contraseña</string>
+    <string name="user_message">Mensaje al usuario</string>
+    <string name="title_about_activity">Acerca de Bitmask"</string>
+    <string name="error_srp_math_error_user_message">Inténtalo de nuevo: error en el servidor.</string>    
+    <string name="error_bad_user_password_user_message">Usuario o contraseña incorrectos.</string>
+    <string name="error_not_valid_password_user_message">Al menos 8 caracteres.</string>
+    <string name="error_client_http_user_message">Inténtalo de nuevo: error en el cliente HTTP</string>
+    <string name="error_io_exception_user_message">Inténtalo de nuevo: error de E/S</string>
+    <string name="error_json_exception_user_message">Inténtalo de nuevo: respuesta mal formada del servidor</string>
+    <string name="error_no_such_algorithm_exception_user_message">Actualiza Bitmask</string>
+    <string name="signup_or_login_button">Registrarse/Iniciar sesión</string>
+    <string name="login_button">Iniciar sesión</string>
+    <string name="logout_button">Cerrar sesión</string>
+    <string name="signup_button">Registrarse</string>
+    <string name="setup_error_title">Error de configuración</string>
+    <string name="setup_error_configure_button">Configurar</string>
+    <string name="setup_error_close_button">Salir</string>
+    <string name="setup_error_text">Sucedió un error configurando Bitmask con tu proveedor elegido.\n\nPuedes volver a intentarlo, o elegir otro proveedor.</string>
+    <string name="server_unreachable_message">No se ha detectado red para hablar con el servidor, inténtalo de nuevo.</string>
+    <string name="malformed_url">No parece que sea un proveedor de Bitmask.</string>
+    <string name="certificate_error">No es un proveedor de Bitmak de confianza.</string>
+    <string name="service_is_down_error">El servicio está caído.</string>
+    <string name="configuring_provider">Configurando el proveedor</string>
+    <string name="incorrectly_downloaded_certificate_message">Tu certificado VPN no pudo ser descargado. Intenta iniciar sesión si es posible.</string>
+    <string name="downloading_certificate_message">Descargando certificado VPN</string>
+    <string name="updating_certificate_message">Actualizando certificado VPN</string>
+    <string name="authenticating_message">Iniciando sesión</string>
+    <string name="signingup_message">Registrando un nuevo usuario</string>
+    <string name="logout_message">Cerrando sesión.</string>
+    <string name="logged_out_message">Sesión terminada.</string>
+    <string name="log_out_failed_message">No pudo cerrarse la sesión. Inténtalo más tarde, quizás sea un problema de la red o del proveedor. Si el problema persiste, borra los datos locales de Bitmask desde la configuración de Android.</string>
+    <string name="login.riseup.warning">"Usuarios de Riseup: es necesario crear una cuenta aparte para utilizar el servicio de VPN."</string>
+    <string name="succesful_authentication_message">Sesión iniciada.</string>
+    <string name="authentication_failed_message">Inicio de sesión fallido.</string>
+    <string name="registration_failed_message">Falló el registro de un nuevo usuario.</string>
+    <string name="eip_status_start_pending">Iniciando la conexión</string>
+    <string name="eip_cancel_connect_title">¿Abortar conexión?</string>
+    <string name="eip_cancel_connect_text">Hay una conexión iniciándose. ¿Quieres cancelarla?</string>
+    <string name="eip.warning.browser_inconsistency">Para salvaguardar la privacidad de tu información personal, te recomendamos que después de apagar la VPN cierres la sesión del navegador y abras una sesión privada en él. Gracias.</string>
+    <string name="yes">Sí</string>
+    <string name="no">No</string>
+    <string name="eip_state_not_connected">"¡Conexión no protegida!"</string>
+    <string name="eip_state_connected">Conexión protegida.</string>
+    <string name="provider_problem">Parece que hay un problema con el proveedor.</string>
+    <string name="try_another_provider">Prueba con otro proveedor, o contacta con este.</string>
 </resources>
-- 
cgit v1.2.3


From fe85613a73d48ebeadc7d35e8d346d68bd0b4fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 7 Apr 2015 12:55:09 +0200
Subject: Move switch down

---
 app/src/main/res/layout/eip_service_fragment.xml | 18 +++++++++---------
 app/src/main/res/values-es/strings.xml           |  2 +-
 app/src/main/res/values/strings.xml              |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml
index 64d22147..6adcfab0 100644
--- a/app/src/main/res/layout/eip_service_fragment.xml
+++ b/app/src/main/res/layout/eip_service_fragment.xml
@@ -13,15 +13,7 @@
         android:layout_marginLeft="10dp"
         android:clickable="true"
         android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <Switch
-        android:id="@+id/eipSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dp" />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <ProgressBar
         android:id="@+id/eipProgress"
@@ -48,4 +40,12 @@
         android:clickable="true"
         android:text="@string/eip_state_not_connected" />
 
+    <Switch
+        android:id="@+id/eipSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/status_message"
+        android:layout_toRightOf="@+id/status_message"
+        android:layout_toEndOf="@+id/status_message" />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 249a9720..b9c01afa 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,7 +17,7 @@
     <string name="provider_label">Proveedor:</string>
     <string name="provider_label_none">Ningún proveedor configurado</string>
     <string name="status_unknown">Estado no definido.</string>
-    <string name="eip_service_label">Acceso a Internet Encriptado</string>
+    <string name="eip_service_label">Acceso a Internet Encriptado con VPN</string>
     <string name="configuration_wizard_title">Elige un proveedor</string>
     <string name="new_provider_button">Nuevo proveedor</string>
     <string name="introduce_new_provider">Añadir un nuevo proveedor</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1e33928..47ff2832 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,7 +16,7 @@
     <string name="provider_label">Provider:</string>
     <string name="provider_label_none">No provider configured</string>
     <string name="status_unknown">Status unknown.</string>
-    <string name="eip_service_label">Encrypted Internet</string>
+    <string name="eip_service_label">VPN Encrypted Internet Access</string>
     <string name="configuration_wizard_title">Select a service provider</string>
     <string name="new_provider_button">Add new Provider</string>
     <string name="introduce_new_provider">Add a new service provider</string>
-- 
cgit v1.2.3


From c8d84fb5fdf1bc834c3ef26eacb4eb1df9ed3668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 7 Apr 2015 17:45:20 +0200
Subject: Trying to conjugate the Spanish verbs programmatically.

---
 app/src/main/res/values-es/arrays.xml | 18 ++++++++++++++++++
 app/src/main/res/values/arrays.xml    | 17 +++++++++++++++++
 2 files changed, 35 insertions(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
index 045e125f..731330b2 100644
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -1,3 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
+    <string-array name="verb_to_be">
+        <item>soy</item>
+        <item>estás</item>
+        <item>está</item>
+        <item>estamos</item>
+        <item>estáis</item>
+        <item>están</item>
+    </string-array>
+
+    <string-array name="personal_pronouns">
+        <item>Yo</item>
+        <item>Tú</item>
+        <item>Él</item>
+        <item>Nosotros</item>
+        <item>Vosotros</item>
+        <item>Ellos</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 66f07a87..3c960442 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
+    <string-array name="verb_to_be">
+        <item>am</item>
+        <item>are</item>
+        <item>is</item>
+        <item>are</item>
+        <item>are</item>
+        <item>are</item>
+    </string-array>
+
+    <string-array name="personal_pronouns">
+        <item>I</item>
+        <item>You</item>
+        <item>He</item>
+        <item>We</item>
+        <item>You</item>
+        <item>They</item>
+    </string-array>
 </resources>
-- 
cgit v1.2.3


From f8f636d90a1110554eda858420e5052e88a250b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 10 Apr 2015 10:39:51 +0200
Subject: Seems to work.

---
 app/src/main/res/values-es/strings.xml | 8 ++++++++
 app/src/main/res/values/strings.xml    | 8 +++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index b9c01afa..47dc2bc8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,4 +74,12 @@
     <string name="eip_state_connected">Conexión protegida.</string>
     <string name="provider_problem">Parece que hay un problema con el proveedor.</string>
     <string name="try_another_provider">Prueba con otro proveedor, o contacta con este.</string>
+    <string name="default_user"></string>
+    <string name="logged_in_user_status">inició sesión.</string>
+    <string name="logged_out_user_status">cerró la sesión.</string>
+    <string name="didnt_log_out_user_status">no cerró la sesión.</string>
+    <string name="not_logged_in_user_status">no has iniciado sesión.</string>
+    <string name="logging_in_user_status">está iniciando sesión.</string>
+    <string name="logging_out_user_status">está cerrando sesión.</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 47ff2832..ea2d74ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,6 @@
     <string name="signingup_message">Signing up</string>
     <string name="logout_message">Logging out from this session.</string>
     <string name="logged_out_message">Logged out.</string>
-    <string name="log_out_failed_message">Didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings</string>
     <string name="login.riseup.warning">"Riseup users: You need to create a separate account to use the VPN service"</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
@@ -73,4 +72,11 @@
     <string name="eip_state_connected">Connection Secure.</string>
     <string name="provider_problem">It seems there is a problem with the provider.</string>
     <string name="try_another_provider">Please try another provider, or contact yours.</string>
+    <string name="default_user">You</string>
+    <string name="logged_in_user_status">is logged in.</string>
+    <string name="logged_out_user_status">logged out.</string>
+    <string name="didnt_log_out_user_status">didn\'t log out. Try later, it may be a problem in the network or in the provider. If the problem persists, then wipe Bitmask data from the Android settings</string>
+    <string name="not_logged_in_user_status">have not logged in.</string>
+    <string name="logging_in_user_status">is logging in.</string>
+    <string name="logging_out_user_status">is logging out.</string>
 </resources>
-- 
cgit v1.2.3


From a1a00e4340ac869eb6be524fb9ae1197ab79762c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 14 Apr 2015 17:57:54 +0200
Subject: Signing up string.

---
 app/src/main/res/values-es/strings.xml |  5 +----
 app/src/main/res/values/arrays.xml     | 17 -----------------
 app/src/main/res/values/strings.xml    |  5 +----
 3 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 47dc2bc8..9e0382dd 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -55,10 +55,6 @@
     <string name="incorrectly_downloaded_certificate_message">Tu certificado VPN no pudo ser descargado. Intenta iniciar sesión si es posible.</string>
     <string name="downloading_certificate_message">Descargando certificado VPN</string>
     <string name="updating_certificate_message">Actualizando certificado VPN</string>
-    <string name="authenticating_message">Iniciando sesión</string>
-    <string name="signingup_message">Registrando un nuevo usuario</string>
-    <string name="logout_message">Cerrando sesión.</string>
-    <string name="logged_out_message">Sesión terminada.</string>
     <string name="log_out_failed_message">No pudo cerrarse la sesión. Inténtalo más tarde, quizás sea un problema de la red o del proveedor. Si el problema persiste, borra los datos locales de Bitmask desde la configuración de Android.</string>
     <string name="login.riseup.warning">"Usuarios de Riseup: es necesario crear una cuenta aparte para utilizar el servicio de VPN."</string>
     <string name="succesful_authentication_message">Sesión iniciada.</string>
@@ -81,5 +77,6 @@
     <string name="not_logged_in_user_status">no has iniciado sesión.</string>
     <string name="logging_in_user_status">está iniciando sesión.</string>
     <string name="logging_out_user_status">está cerrando sesión.</string>
+    <string name="signingup_message">está siendo registrado.</string>
 
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 3c960442..66f07a87 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
-    <string-array name="verb_to_be">
-        <item>am</item>
-        <item>are</item>
-        <item>is</item>
-        <item>are</item>
-        <item>are</item>
-        <item>are</item>
-    </string-array>
-
-    <string-array name="personal_pronouns">
-        <item>I</item>
-        <item>You</item>
-        <item>He</item>
-        <item>We</item>
-        <item>You</item>
-        <item>They</item>
-    </string-array>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ea2d74ae..ac6191a9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,10 +54,6 @@
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="downloading_certificate_message">Downloading VPN certificate</string>
     <string name="updating_certificate_message">Updating VPN certificate</string>
-    <string name="authenticating_message">Logging in</string>
-    <string name="signingup_message">Signing up</string>
-    <string name="logout_message">Logging out from this session.</string>
-    <string name="logged_out_message">Logged out.</string>
     <string name="login.riseup.warning">"Riseup users: You need to create a separate account to use the VPN service"</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
     <string name="authentication_failed_message">Authentication failed.</string>
@@ -79,4 +75,5 @@
     <string name="not_logged_in_user_status">have not logged in.</string>
     <string name="logging_in_user_status">is logging in.</string>
     <string name="logging_out_user_status">is logging out.</string>
+    <string name="signingup_message">is being registered.</string>
 </resources>
-- 
cgit v1.2.3


From e522e5e325e6ed19b1316fd251f3c212a2344d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 14 Apr 2015 18:35:20 +0200
Subject: Typo, segunda persona

---
 app/src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9e0382dd..7ab5150e 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -74,7 +74,7 @@
     <string name="logged_in_user_status">inició sesión.</string>
     <string name="logged_out_user_status">cerró la sesión.</string>
     <string name="didnt_log_out_user_status">no cerró la sesión.</string>
-    <string name="not_logged_in_user_status">no has iniciado sesión.</string>
+    <string name="not_logged_in_user_status">no ha iniciado sesión.</string>
     <string name="logging_in_user_status">está iniciando sesión.</string>
     <string name="logging_out_user_status">está cerrando sesión.</string>
     <string name="signingup_message">está siendo registrado.</string>
-- 
cgit v1.2.3


From c8994b645b607723bdaba4c2aa1ff0d19a9c0c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 15 Apr 2015 10:41:59 +0200
Subject: Set accept-language in ProviderAPI, language-country

String locale = Locale.getDefault().getLanguage() + Locale.getDefault().getCountry();
---
 app/src/main/res/values-es/arrays.xml | 18 ------------------
 1 file changed, 18 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
index 731330b2..045e125f 100644
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -1,21 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--  Keep the order the same as the TYPE_ constants in VPNProfile -->
-    <string-array name="verb_to_be">
-        <item>soy</item>
-        <item>estás</item>
-        <item>está</item>
-        <item>estamos</item>
-        <item>estáis</item>
-        <item>están</item>
-    </string-array>
-
-    <string-array name="personal_pronouns">
-        <item>Yo</item>
-        <item>Tú</item>
-        <item>Él</item>
-        <item>Nosotros</item>
-        <item>Vosotros</item>
-        <item>Ellos</item>
-    </string-array>
 </resources>
-- 
cgit v1.2.3