From 3fd35b1e694560b002435df80d6ebd3ce34e5a74 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Wed, 1 Nov 2017 15:29:52 +0100 Subject: add licence note for okhttp to about page --- app/src/main/res/layout/about.xml | 15 +++++++++++++++ app/src/main/res/values/untranslatable.xml | 7 ++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'app/src') diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index 2669caa3..3188d16f 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -134,6 +134,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openssl" /> + + + + + + diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 2d7f904b..39d0de36 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -4,21 +4,22 @@ Bitmask Bitmask - %s - Copyright 2012-2014\nLEAP Encryption Access Project <info@leap.se> + Copyright 2012-2017\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 This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit\n Copyright © 1998-2008 The OpenSSL Project. All rights reserved.\n\n This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)\n Copyright © 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved. + Copyright Copyright 2016 Square, Inc. + OkHttp OpenVPN LZO OpenSSL Unknown state - Copyright 2012–2014 Arne Schwabe <arne@rfc2549.org> + Copyright 2012–2017 Arne Schwabe <arne@rfc2549.org> openvpn.uni-paderborn.de 1194 -- cgit v1.2.3