diff options
| author | Parménides GV <parmegv@sdf.org> | 2013-07-19 06:44:08 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@sdf.org> | 2013-07-19 06:44:08 +0200 |
| commit | c7f73c9ef8f64351d4e462106a2ab5d216810684 (patch) | |
| tree | 10992d03cd3d0227c19755fed863e2e4c2141924 | |
| parent | 5239e2fc0d070026ba851118a8f54fae6df827b3 (diff) | |
| parent | 2adf51e117e638f520a9d094fd806fb81ecd6207 (diff) | |
Merge branch 'feature/branding' into develop
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout/about.xml | 2 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 17f044f8..95997475 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -143,7 +143,7 @@ <activity android:name="se.leap.leapclient.Dashboard" android:label="@string/title_activity_dashboard" > - <intent-filter> + <intent-filter android:label="@string/app_name"> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> 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 <info@leap.se></string> + <string name="copyright_leapgui" translatable="false">Copyright 2012\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.\n</string> |