summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2020-04-04 09:56:59 -0700
committercyberta <cyberta@riseup.net>2020-04-04 09:56:59 -0700
commitefc23e90a94f0ea94fd6774b1c8868f4b31b3a12 (patch)
tree7f2cf55197bc982c2671fe6a55114d994ddab631 /app/src
parente0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (diff)
parent666e6155ddf42f0c16580dec3c4d25a2f7105436 (diff)
Merge branch 'master' into 'master'
You've already done a release and many changes, update ©year See merge request leap/bitmask_android!104
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/res/values/untranslatable.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 6ee4a671..50e44fce 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -1,7 +1,7 @@
<?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 (c) 2012-2019\nLEAP Encryption Access Project &lt;info@leap.se></string>
+ <string name="copyright_leapgui" translatable="false">Copyright (c) 2012-2020\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 (c) 1996 - 2011 Markus Franz Xaver Johannes Oberhumer</string>
@@ -41,4 +41,4 @@
<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
+</resources>