diff options
| author | cyBerta <richy@cyborgsociety.org> | 2013-12-21 00:49:13 +0100 |
|---|---|---|
| committer | cyBerta <richy@cyborgsociety.org> | 2013-12-21 01:06:35 +0100 |
| commit | dbf1265f736c00aa31289e75818b1ec56311d31c (patch) | |
| tree | 03b4851373e2f9b98e1bc80775afd0506d8169b8 /res | |
| parent | 8387712a5488b3aadd308b67e7659b8f187d501b (diff) | |
| parent | af5268b24a546f9a7a2693ec3ae339dd6ca7ea4f (diff) | |
there's no about fragment anymore
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/about.xml | 19 | ||||
| -rwxr-xr-x | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 2 | ||||
| -rw-r--r-- | res/xml/main_headers.xml | 4 |
4 files changed, 11 insertions, 15 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 40a15794..875bba64 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -1,7 +1,10 @@ -<?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" > + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/dashboardLayout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".Dashboard" > <LinearLayout android:layout_width="match_parent" @@ -39,10 +42,6 @@ android:layout_height="wrap_content" android:autoLink="all" /> - <Space - android:layout_width="match_parent" - android:layout_height="10sp" /> - <TextView android:layout_width="match_parent" android:layout_height="wrap_content" @@ -74,10 +73,6 @@ android:layout_width="match_parent" android:layout_height="20sp" /> - <Space - android:layout_width="match_parent" - android:layout_height="20sp" /> - <TextView android:layout_width="match_parent" android:layout_height="wrap_content" @@ -105,4 +100,4 @@ android:text="@string/copyright_openssl" /> </LinearLayout> -</ScrollView>
\ No newline at end of file +</ScrollView> diff --git a/res/values/strings.xml b/res/values/strings.xml index 609310b8..a5bb6b83 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -284,6 +284,7 @@ <string name="username_ask">Please enter your username</string> <string name="password_hint">password</string> <string name="user_message">User message</string> + <string name="title_about_activity">About Bitmask"</string> <string name="error_srp_math_error_user_message">Try again: server math error.</string> <string name="error_bad_user_password_user_message">Incorrect username or password.</string> <string name="error_not_valid_password_user_message">It should have at least 8 characters.</string> diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index 8c15a213..9edbc247 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -6,7 +6,7 @@ <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> + "OpenVPN" is a trademark of OpenVPN Technologies, Inc.</string> <string name="defaultserver" translatable="false">openvpn.uni-paderborn.de</string> <string name="defaultport" translatable="false">1194</string> <string name="lzo_copyright" translatable="false">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string> diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml index 1ee238ea..d1cca3ea 100644 --- a/res/xml/main_headers.xml +++ b/res/xml/main_headers.xml @@ -12,9 +12,9 @@ android:fragment="se.leap.openvpn.FaqFragment" android:summary="@string/faq_summary" android:title="@string/faq" /> - <header + <!-- <header android:fragment="se.leap.openvpn.AboutFragment" android:summary="@string/about_summary" android:title="@string/about" /> - + --> </preference-headers>
\ No newline at end of file |