diff options
| author | Parménides GV <parmegv@sdf.org> | 2014-06-24 09:33:12 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2014-06-24 09:33:12 +0200 |
| commit | a05b227b44f9f4ff6100bc3cead7bacd74ba1a93 (patch) | |
| tree | 07046dc1e735502fd1daf359a9554b6fdacb0e0b | |
| parent | 207a6e2dbce2694a1f567746d450d8e310825fa1 (diff) | |
| parent | 49aee8dd5fe884eabdc291d758bb8a635f9d1271 (diff) | |
Merge branch 'bug/update-copyright-dates-#5806' into develop
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/untranslatable.xml | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -81,3 +81,4 @@ G* *.dot /ics-openvpn/ /TAGS +/ics-openvpn diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index cc39df3d..6bffb192 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -3,7 +3,7 @@ <string name="app" translatable="false">Bitmask</string> <string name="app_name" translatable="false">Bitmask</string> - <string name="copyright_leapgui" translatable="false">Copyright 2012\nLEAP Encryption Access Project <info@leap.se></string> + <string name="copyright_leapgui" translatable="false">Copyright 2012-2014\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> @@ -892,4 +892,4 @@ -</resources>
\ No newline at end of file +</resources> |