diff options
| author | fupduck <fupduck@riseup.net> | 2018-02-27 10:29:31 -0800 |
|---|---|---|
| committer | fupduck <fupduck@riseup.net> | 2018-02-27 10:29:31 -0800 |
| commit | 25f20f0a5b028e60e5a4658fb30b929709939408 (patch) | |
| tree | be29efacc1e841db0ccdc7d88019747b7b10688f /app/src/main/res/values | |
| parent | be24e1bbc336f870d6c9a9eda6a0201e9f79d90f (diff) | |
| parent | 51944da747bc883eeef09bb5ffc9b395416ec253 (diff) | |
Merge branch '#8875_libraries_licences' into '0.9.8'
#8875 update licenses
See merge request leap/bitmask_android!60
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 20 |
1 files changed, 10 insertions, 10 deletions
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 <info@leap.se></string> + <string name="copyright_leapgui" translatable="false">Copyright 2012-2018\nLEAP Encryption Access Project <info@leap.se></string> <string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. <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 <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> |