summaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-02-27 20:48:13 +0100
committercyBerta <cyberta@riseup.net>2018-02-27 20:48:13 +0100
commit69d7e4bc6d77e40407a404606b55630c35a4050b (patch)
treeae032982d0f5354f46927d3fb0f78bc331af5dfb /app/src/main/res/values
parente9c52ffc7965c96841f6ae573b19a0a0e9fc7b71 (diff)
parent96bc3f8d14cab11e43fbe6b11dfb6dbf46e5919b (diff)
Merge branch 'origin_0.9.8'0.9.8
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/strings.xml5
-rw-r--r--app/src/main/res/values/untranslatable.xml20
2 files changed, 14 insertions, 11 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa8fcd6c..71b6d437 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
<string name="vpn.button.turn.off">Turn off</string>
<string name="vpn_button_turn_off_blocking">Stop blocking</string>
<string name="vpn_securely_routed">Your traffic is securely routed through:</string>
+ <string name="vpn_securely_routed_no_internet">No internet connection. Your traffic will be securely routed through:</string>
<string name="bitmask_log">Bitmask Log</string>
<string name="title_activity_main">Bitmask</string>
<string name="log_fragment_title">Log</string>
@@ -106,5 +107,7 @@
<string name="warning_expired_provider_cert">Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate.</string>
<string name="downloading_vpn_certificate_failed">Downloading the VPN certificate failed. Try again or choose another provider.</string>
<string name="vpn_certificate_is_invalid">VPN certificate is invalid. Try to download a new one.</string>
- <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to do download a new one.</string>
+ <string name="vpn_certificate_user_message">The VPN certificate is invalid. Please log in to download a new one.</string>
+ <string name="save_battery">Save battery</string>
+ <string name="save_battery_message">Background data connections will hibernate when your phone is inactive. This feature is still experimental.</string>
</resources>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 59605609..2e91366a 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="notifcation_title_bitmask">Bitmask - %s</string>
-
- <string name="copyright_leapgui" translatable="false">Copyright 2012-2017\nLEAP Encryption Access Project &lt;info@leap.se></string>
+ <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project &lt;info@leap.se></string>
<string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string>
<string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string>
@@ -15,20 +14,21 @@
<string name="openvpn" translatable="false">OpenVPN</string>
<string name="lzo" translatable="false">LZO</string>
<string name="openssl" translatable="false">OpenSSL</string>
+ <string name="mbetTLS" translatable="false">Mbed TLS</string>
+ <string name="copyright_mbetTLS" translatable="false">Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: apache-2.0.txt. \n
+ https://github.com/schwabe/polarssl/blob/icsopenvpn_270/apache-2.0.txt
+ </string>
+ <string name="asio">Asio</string>
+ <string name="copyright_asio">Boost Software License - Version 1.0 - August 17th, 2003</string>
+ <string name="openvpn3">OpenVPN 3</string>
+ <string name="copyright_openvpn3">GNU AFFERO GENERAL PUBLIC LICENSE\n
+ Version 3, 19 November 2007</string>
<string name="unknown_state" translatable="false">Unknown state</string>
-
<string name="copyright_blinktgui" translatable="false">Copyright 2012–2017 Arne Schwabe &lt;arne@rfc2549.org></string>
-
<string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string>
<string name="defaultport" translatable="false">1194</string>
<string name="copyright_file_dialog" translatable="false">File Dialog based on work by Alexander Ponomarev</string>
-
-
-
<string name="file_dialog" translatable="false">File Dialog</string>
-
-
-
<string name="permission_description">Allows another app to control OpenVPN</string>
<string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string>
<string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>