summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2017-11-01 15:29:52 +0100
committercyBerta <cyberta@riseup.net>2017-11-01 15:29:52 +0100
commit3fd35b1e694560b002435df80d6ebd3ce34e5a74 (patch)
treeb721c4ab34aa6132b6388aa2c1c3c0bd782dafb2 /app/src
parent957fd3d9928ed86cee22dd97f0ac56ef98eecd2b (diff)
add licence note for okhttp to about page
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/res/layout/about.xml15
-rw-r--r--app/src/main/res/values/untranslatable.xml7
2 files changed, 19 insertions, 3 deletions
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" />
+
+ <Space
+ android:layout_width="match_parent"
+ android:layout_height="20sp" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/okhttp"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/copyright_okhttp" />
</LinearLayout>
</ScrollView>
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 @@
<string name="app_name" translatable="false">Bitmask</string>
<string name="notifcation_title_bitmask">Bitmask - %s</string>
- <string name="copyright_leapgui" translatable="false">Copyright 2012-2014\nLEAP Encryption Access Project &lt;info@leap.se></string>
+ <string name="copyright_leapgui" translatable="false">Copyright 2012-2017\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>
<string name="copyright_openssl" translatable="false"> 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.</string>
+ <string name="copyright_okhttp" translatable="false">Copyright Copyright 2016 Square, Inc.</string>
+ <string name="okhttp" translatable="false">OkHttp</string>
<string name="openvpn" translatable="false">OpenVPN</string>
<string name="lzo" translatable="false">LZO</string>
<string name="openssl" translatable="false">OpenSSL</string>
<string name="unknown_state" translatable="false">Unknown state</string>
- <string name="copyright_blinktgui" translatable="false">Copyright 2012–2014 Arne Schwabe &lt;arne@rfc2549.org></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>