diff options
| -rw-r--r-- | res/layout/about.xml | 38 | ||||
| -rw-r--r-- | res/layout/faq.xml | 3 | ||||
| -rw-r--r-- | res/layout/vpn_profile_list.xml | 19 | ||||
| -rwxr-xr-x | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 4 |
5 files changed, 41 insertions, 25 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index e6abed96..09194631 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" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" > <LinearLayout android:layout_width="match_parent" @@ -11,7 +14,9 @@ <TextView android:id="@+id/version" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceLarge" + tools:ignore="SelectableText" /> <Space android:layout_width="match_parent" @@ -40,7 +45,8 @@ <TextView android:id="@+id/donatestring" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + tools:ignore="SelectableText" /> <Space android:layout_width="match_parent" @@ -50,7 +56,8 @@ android:id="@+id/translation" android:layout_width="match_parent" android:layout_height="wrap_content" - android:autoLink="all" /> + android:autoLink="all" + tools:ignore="SelectableText" /> <Space android:layout_width="match_parent" @@ -127,18 +134,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_openssl" /> - - + + <Space + android:layout_width="match_parent" + android:layout_height="20sp" /> + <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/bouncy_castle" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/bouncy_castle" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/copyright_bouncycastle" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/copyright_bouncycastle" /> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/layout/faq.xml b/res/layout/faq.xml index 11ca7015..354b467c 100644 --- a/res/layout/faq.xml +++ b/res/layout/faq.xml @@ -3,7 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:padding="@dimen/stdpadding" > + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" > <LinearLayout android:layout_width="match_parent" diff --git a/res/layout/vpn_profile_list.xml b/res/layout/vpn_profile_list.xml index f4a24ece..870c0431 100644 --- a/res/layout/vpn_profile_list.xml +++ b/res/layout/vpn_profile_list.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" > + android:orientation="vertical" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" > <ListView android:id="@android:id/list" @@ -24,22 +27,24 @@ <Space android:layout_width="match_parent" - android:layout_height="10sp" /> + android:layout_height="12sp" /> <TextView android:id="@+id/add_new_vpn_hint" android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + tools:ignore="SelectableText" /> <TextView android:id="@+id/import_vpn_hint" android:layout_width="fill_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + tools:ignore="SelectableText" /> -<Space + <Space android:layout_width="match_parent" - android:layout_height="10sp" /> - + android:layout_height="12sp" /> + <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" diff --git a/res/values/strings.xml b/res/values/strings.xml index b300c187..c2003290 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -226,7 +226,7 @@ <string name="openvpn_log">OpenVPN Log</string> <string name="import_config">Import OpenVPN configuration</string> <string name="battery_consumption_title">Battery consumption</string> - <string name="baterry_consumption">In my personal tests the main reason for high battery consumption of OpenVPN are the keepalive packets. Most OpenVPN servers have a configuration directive like \'keepalive 10 60\' which translates to a keepalive packet from client to server and server to client every ten seconds. <p> While these packets are small and do not use much traffic, they keep the mobile radio network busy and increase the energy consumption. <p> This keepalive setting cannot be changed on the client. Only the system administrator of the OpenVPN can change the setting. <p> Unfortunately using a keepalive larger than 60 seconds with udp has problems with some NAT gateways which terminate the state for a connnection after a short timeout (60s in my tests). Using TCP with long keepalive timeout works but has the TCP over TCP problem. (See <a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\">Why TCP Over TCP Is A Bad Ide</a>)</string> + <string name="baterry_consumption">In my personal tests the main reason for high battery consumption of OpenVPN are the keepalive packets. Most OpenVPN servers have a configuration directive like \'keepalive 10 60\' which translates to a keepalive packet from client to server and server to client every ten seconds. <p> While these packets are small and do not use much traffic, they keep the mobile radio network busy and increase the energy consumption. (See also <a href="http://developer.android.com/training/efficient-downloads/efficient-network-access.html#RadioStateMachine">The Radio State Machine | Android Developers</a>) <p> This keepalive setting cannot be changed on the client. Only the system administrator of the OpenVPN can change the setting. <p> Unfortunately using a keepalive larger than 60 seconds with udp has problems with some NAT gateways which terminate the state for a connnection after a short timeout (60s in my tests). Using TCP with long keepalive timeout works but has the TCP over TCP problem. (See <a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\">Why TCP Over TCP Is A Bad Ide</a>)</string> <string name="faq_tethering">The Android Tethering feature (over WiFi, USB or Bluetooth) and the VPNService API (used by this program) do not work together. For more details see the <a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=34\">issue #34</a></string> <string name="vpn_tethering_title">VPN and Tethering</string> <string name="connection_retries">Connection retries</string> diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index 1c858363..70ca6b7f 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\nArne Schwabe <arne@rfc2549.org></string> + <string name="copyright_blinktgui" translatable="false">Copyright 2012–2013 Arne Schwabe <arne@rfc2549.org></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> @@ -20,7 +20,7 @@ <string name="unknown_state" translatable="false">Unknown state</string> <string name="permission_description">Allows another app to control OpenVPN</string> <string name="bouncy_castle" translatable="false">Bouncy Castle Crypto APIs</string> - <string name="copyright_bouncycastle" translatable="false">Copyright © 2000 - 2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string> + <string name="copyright_bouncycastle" translatable="false">Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)</string> <string-array name="tls_directions_values" translatable="false"> <item>0</item> |