summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2013-07-19 06:44:08 +0200
committerParménides GV <parmegv@sdf.org>2013-07-19 06:44:08 +0200
commitc7f73c9ef8f64351d4e462106a2ab5d216810684 (patch)
tree10992d03cd3d0227c19755fed863e2e4c2141924 /res
parent5239e2fc0d070026ba851118a8f54fae6df827b3 (diff)
parent2adf51e117e638f520a9d094fd806fb81ecd6207 (diff)
Merge branch 'feature/branding' into develop
Diffstat (limited to 'res')
-rw-r--r--res/layout/about.xml2
-rwxr-xr-xres/values/strings.xml1
-rw-r--r--res/values/untranslatable.xml2
3 files changed, 3 insertions, 2 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml
index 3404686b..74835d1e 100644
--- a/res/layout/about.xml
+++ b/res/layout/about.xml
@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="all"
- android:text="@string/copyright_blinktgui" />
+ android:text="@string/copyright_leapgui" />
<Space
android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8f391ad..3a178037 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,6 +3,7 @@
<resources>
<string name="app">LEAP for Android</string>
+ <string name="app_name">LEAP</string>
<string name="address">Server Address:</string>
<string name="port">Server Port:</string>
<string name="location">Location</string>
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index a794866f..fe620aa8 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="copyright_blinktgui" translatable="false">Copyright 2012\nLEAP &lt;info@leap.se></string>
+ <string name="copyright_leapgui" translatable="false">Copyright 2012\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.\n</string>