diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/basic_settings.xml | 1 | ||||
| -rw-r--r-- | res/layout/vpn_list_item.xml | 2 | ||||
| -rw-r--r-- | res/menu/logmenu.xml | 19 | ||||
| -rw-r--r-- | res/menu/vpn_context.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 12 |
5 files changed, 25 insertions, 12 deletions
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index e19ec148..6d4b8cc1 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -168,7 +168,6 @@ android:layout_marginLeft="8dip" android:layout_marginRight="8dip" android:hint="@string/pw_query_hint" - android:inputType="textPassword" /> </LinearLayout> diff --git a/res/layout/vpn_list_item.xml b/res/layout/vpn_list_item.xml index 75da3cf5..16d7d5bd 100644 --- a/res/layout/vpn_list_item.xml +++ b/res/layout/vpn_list_item.xml @@ -23,7 +23,7 @@ <LinearLayout android:id="@+id/vpn_list_item_left" - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" android:background="?android:attr/selectableItemBackground" diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml index 80331c5e..b8fd286b 100644 --- a/res/menu/logmenu.xml +++ b/res/menu/logmenu.xml @@ -5,13 +5,18 @@ android:id="@+id/clearlog"
android:icon="@drawable/ic_menu_trash_holo_light"
android:showAsAction="ifRoom|withText"
- android:title="@string/clear_log"/>
-
- <item android:id="@+id/cancel"
+ android:title="@string/clear_log"
+ android:titleCondensed="@string/clear"/>
+ <item
+ android:id="@+id/cancel"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:showAsAction="ifRoom|withText"
android:title="@string/cancel_connection"
- />
-
-
-</menu>
\ No newline at end of file + android:titleCondensed="@string/cancel"/>
+ <item
+ android:id="@+id/info"
+ android:icon="@android:drawable/ic_menu_info_details"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/show_connection_details"
+ android:titleCondensed="@string/info"/>
+
</menu>
\ No newline at end of file diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml index 477c6a8a..239f1577 100644 --- a/res/menu/vpn_context.xml +++ b/res/menu/vpn_context.xml @@ -18,9 +18,8 @@ <!-- <item android:id="@+id/connect_vpn" android:alphabeticShortcut="c" - android: android:icon="@android:drawable/ic_media_play" - android:showAsAction="withText|ifRoom" + android:showAsAction="ifRoom|withText" android:title="@string/connect"/> --> </menu>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 53483b80..cf8cc5c8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -115,7 +115,6 @@ <string name="custom_config_title">Enable Custom Options</string> <string name="custom_config_summary">Specify custom options. Use with care!</string> <string name="route_rejected">Route rejected by Android</string> - <string formatted="false" name="ip_not_cidr">Cannot make sense of %s and %s as IP and CIDR netmask, assuming second address is peer address of remote. Using /32 netmask for local IP.</string> <string name="cancel_connection">Disconnect</string> <string name="clear_log">clear log</string> <string name="title_cancel">Cancel Confirmation</string> @@ -156,4 +155,15 @@ <string name="tun_error_helpful">" On some custom ICS images the permission on /dev/tun might be wrong, or the tun module might be missing completly"</string> <string name="tun_open_error">Opening tun interface failed badly.</string> <string name="error">"Error: "</string> + <string name="clear">Clear</string> + <string name="info">info</string> + <string name="show_connection_details">Show connection details</string> + <string name="last_openvpn_tun_config">Last interface configuration from Openvpn:</string> + <string name="local_ip_info">Local IP: %1$s/%2$d</string> + <string name="dns_server_info">DNS Server: %s</string> + <string name="dns_domain_info">DNS Domain: %s</string> + <string name="routes_info">Routes: %s</string> + <string name="ip_not_cidr">Cannot make sense of %1$s and %2$s as local IP with CIDR netmask, assuming second address is peer address of remote. Using /32 netmask for local IP.</string> + <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string> + <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string> </resources> |