summaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-23 14:45:31 +0100
committerParménides GV <parmegv@sdf.org>2015-03-23 14:45:31 +0100
commitbcead6b6e6d8c6e94fc486d486534e17a2d69db0 (patch)
treee1ba58a98e00ffe6528aeb965250d389aaef171d /app/src/main/res
parent3a7b9c1c746bd26b4e689814c3a4ec6b3141a76a (diff)
parent30d92be6e9401926d9efaafc332d764211d882e6 (diff)
Merge branch 'develop' into release-0.9.3
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 897223ad..d1e33928 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,14 +59,14 @@
<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>
<string name="registration_failed_message">Registration failed.</string>
- <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
- <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
<string name="eip_status_start_pending">Initiating connection</string>
<string name="eip_cancel_connect_title">Cancel connection?</string>
<string name="eip_cancel_connect_text">There is a connection attempt in progress. Do you wish to cancel it?</string>
+ <string name="eip.warning.browser_inconsistency">In order to avoid leaking your personal information, please close your browser and start a private window after disconnecting the Encrypted VPN Internet Access. Thanks.</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="eip_state_not_connected">"Not running! Connection not secure!"</string>