From d6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 19 Feb 2018 13:05:49 +0100 Subject: fix invalid vpn user message --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa8fcd6c..2ea4670a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,5 +106,5 @@ Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate. Downloading the VPN certificate failed. Try again or choose another provider. VPN certificate is invalid. Try to download a new one. - The VPN certificate is invalid. Please log in to do download a new one. + The VPN certificate is invalid. Please log in to download a new one. -- cgit v1.2.3 From 06eb4014837704e04d6ea8e9d7a69475a58c3c65 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 23 Feb 2018 02:22:25 +0100 Subject: #8754 enable pause openvpn on device inactivity feature --- app/src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..a69c2420 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -107,4 +107,7 @@ Downloading the VPN certificate failed. Try again or choose another provider. VPN certificate is invalid. Try to download a new one. The VPN certificate is invalid. Please log in to download a new one. + Save battery + Save Battery Warning + Background data connections will hibernate when your phone is inactive. This feature is still experimental. -- cgit v1.2.3 From ad086ab192b9094278b27f94120566a7ca21dccc Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 23 Feb 2018 02:34:55 +0100 Subject: #8754 fix dialog cancellation handling and change dialog title --- app/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a69c2420..a0ca00c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -108,6 +108,5 @@ VPN certificate is invalid. Try to download a new one. The VPN certificate is invalid. Please log in to download a new one. Save battery - Save Battery Warning - Background data connections will hibernate when your phone is inactive. This feature is still experimental. + Background data connections will hibernate when your phone is inactive. This feature is still experimental. -- cgit v1.2.3 From 2324de2a0bbcdd6befe4bbe1fea70731d538b664 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Sun, 25 Feb 2018 10:24:49 +0100 Subject: 8865 - resolve discussions --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..2c191afa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Turn off Stop blocking Your traffic is securely routed through: + No internet connection. Your traffic will be securely routed through: Bitmask Log Bitmask Log -- cgit v1.2.3 From 5f19f3786147a4b28ac1b5dbe2c8c1f0c6e3f77f Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 27 Feb 2018 13:23:43 +0100 Subject: 8871 - rename sign up/log in --- app/src/main/res/values/strings.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..f4a5e6a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,12 +39,11 @@ Try again: I/O error Try again: Bad response from the server Encryption algorithm not found. Please upgrade Android! - Sign Up/Log In Log In - Log in to profile + Log In Log Out Sign Up - Create profile + Sign Up Set up provider Configuration Error Configure -- cgit v1.2.3 From 51944da747bc883eeef09bb5ffc9b395416ec253 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 27 Feb 2018 18:48:26 +0100 Subject: #8875 update licenses --- app/src/main/res/values/untranslatable.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'app/src/main/res/values') 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 @@ Bitmask - %s - - Copyright 2012-2017\nLEAP Encryption Access Project <info@leap.se> + Copyright 2012-2018\nLEAP Encryption Access Project <info@leap.se> Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n "OpenVPN" is a trademark of OpenVPN Technologies, Inc. Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer @@ -15,20 +14,21 @@ OpenVPN LZO OpenSSL + Mbed TLS + 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 + + Asio + Boost Software License - Version 1.0 - August 17th, 2003 + OpenVPN 3 + GNU AFFERO GENERAL PUBLIC LICENSE\n + Version 3, 19 November 2007 Unknown state - Copyright 2012–2017 Arne Schwabe <arne@rfc2549.org> - openvpn.uni-paderborn.de 1194 File Dialog based on work by Alexander Ponomarev - - - File Dialog - - - Allows another app to control OpenVPN Bouncy Castle Crypto APIs Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) -- cgit v1.2.3 From ebfd6b38aaf5a375aaa4d27d696e22dd432e642a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 27 Feb 2018 19:36:02 +0100 Subject: #8873 add new translations --- app/src/main/res/values/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/src/main/res/values') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 122800ce..a0ca00c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,11 +39,12 @@ Try again: I/O error Try again: Bad response from the server Encryption algorithm not found. Please upgrade Android! + Sign Up/Log In Log In - Log In + Log in to profile Log Out Sign Up - Sign Up + Create profile Set up provider Configuration Error Configure -- cgit v1.2.3