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/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

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 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/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/values/strings.xml')

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/strings.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/src/main/res/values/strings.xml')

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