From 97ce9dbb5b9103f278ad3da45e93904bfed96dc9 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 19 Nov 2019 23:13:38 +0100
Subject: update about fragment

---
 app/src/main/res/layout-xlarge/f_about.xml | 51 ++++++++++++++++++++++++++++++
 app/src/main/res/layout/f_about.xml        | 45 ++++++++++++++++++++++++++
 app/src/main/res/values/untranslatable.xml | 21 +++++++-----
 3 files changed, 109 insertions(+), 8 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml
index 4165215c..1d915da4 100644
--- a/app/src/main/res/layout-xlarge/f_about.xml
+++ b/app/src/main/res/layout-xlarge/f_about.xml
@@ -213,6 +213,57 @@
             android:layout_height="wrap_content"
             android:textSize="18sp"
             android:text="@string/copyright_openvpn3" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_library"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_shapeshifter_library" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_dispatcher"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_shapeshifter_dispatcher" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_transports"
+            android:textSize="24sp"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="18sp"
+            android:text="@string/copyright_shapeshifter_transports" />
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml
index b4a8d9b6..86be3a56 100644
--- a/app/src/main/res/layout/f_about.xml
+++ b/app/src/main/res/layout/f_about.xml
@@ -205,6 +205,51 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/copyright_openvpn3" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_library"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_shapeshifter_library" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_dispatcher"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_shapeshifter_dispatcher" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/shapeshifter_transports"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_shapeshifter_transports" />
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index cbae03fd..6ee4a671 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="notifcation_title_bitmask" translatable="false">%s - %s</string>
-    <string name="copyright_leapgui" translatable="false">Copyright 2012-2019\nLEAP Encryption Access Project &lt;info@leap.se></string>
-    <string name="opevpn_copyright" translatable="false">Copyright ? 2002?2019 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
+    <string name="copyright_leapgui" translatable="false">Copyright (c) 2012-2019\nLEAP Encryption Access Project &lt;info@leap.se></string>
+    <string name="opevpn_copyright" translatable="false">Copyright (c) 2002-2019 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="lzo_copyright" translatable="false">Copyright (c) 1996 - 2011 Markus Franz Xaver Johannes Oberhumer</string>
     <string name="copyright_openssl" translatable="false"> Copyright 1995-2018 The OpenSSL Project Authors. 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 ? 2019 Square, Inc.</string>
+        Copyright 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved.</string>
+    <string name="copyright_okhttp" translatable="false">Copyright (c) 2019 Square, Inc.</string>
     <string name="okhttp" translatable="false">OkHttp</string>
     <string name="openvpn" translatable="false">OpenVPN</string>
     <string name="lzo" translatable="false">LZO</string>
@@ -23,17 +23,22 @@
     <string name="copyright_openvpn3" translatable="false">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?2019 Arne Schwabe &lt;arne@rfc2549.org></string>
+    <string name="copyright_blinktgui" translatable="false">Copyright (c) 2012-2019 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" translatable="false">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>
+    <string name="copyright_bouncycastle" translatable="false">Copyright (c) 2000-2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string>
     <string name="state_user_vpn_permission" translatable="false">Waiting for user permission to use VPN API</string>
     <string name="state_user_vpn_password" translatable="false">Waiting for user VPN password</string>
     <string name="state_user_vpn_password_cancelled" translatable="false">VPN password input dialog cancelled</string>
     <string name="state_user_vpn_permission_cancelled" translatable="false">VPN API permission dialog cancelled</string>
-    <string name="gateway_not_reachable">Could not connect to gateway %s. Trying next one.</string>
+    <string name="shapeshifter_library" translatable="false">Shapeshifter Library</string>
+    <string name="copyright_shapeshifter_library" translatable="false">Copyright (c) 2019, LEAP Encryption Access Project (info@leap.se)</string>
+    <string name="shapeshifter_transports" translatable="false">Shapeshifter Transports</string>
+    <string name="copyright_shapeshifter_transports" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string>
+    <string name="shapeshifter_dispatcher" translatable="false">Shapeshifter Dispatcher</string>
+    <string name="copyright_shapeshifter_dispatcher" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3