Merge Merge try number 2

2 files changed, 27 insertions, 2 deletions

diff --git a/res/menu/vpn_context.xml b/res/menu/vpn_context.xml
new file mode 100644
index 00000000..ab681379
--- /dev/null
+++ b/res/menu/vpn_context.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/edit_vpn"
+        android:icon="@android:drawable/ic_menu_edit"
+        android:showAsAction="withText|ifRoom"
+        android:title="@string/edit_vpn"/>
+    <item
+        android:id="@+id/remove_vpn"
+        android:icon="@android:drawable/ic_menu_delete"
+        android:showAsAction="withText|ifRoom"
+        android:title="@string/remove_vpn"/>
+    <item
+        android:id="@+id/connect_vpn"
+        android:icon="@android:drawable/ic_media_play"
+        android:showAsAction="withText|ifRoom"
+        android:title="@string/connect"/>
+
+</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 07268b0d..53483b80 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,7 +21,7 @@
     <string name="address">Server Address:</string>
     <string name="port">Server Port:</string>
     <string name="secret">Shared Secret:</string>
-    <string name="connect">Connect!</string>
+    <string name="connect">Connect</string>
 
     <string name="connecting">OpenVPN is connecting…</string>
     <string name="connected">OpenVPN is connected!</string>
@@ -116,7 +116,7 @@
     <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">cancel</string>
+    <string name="cancel_connection">Disconnect</string>
     <string name="clear_log">clear log</string>
     <string name="title_cancel">Cancel Confirmation</string>
     <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
@@ -151,4 +151,9 @@
     <string name="float_summary">Allows authenticated packets from any IP</string>
     <string name="float_title">Allow floating server</string>
     <string name="custom_options_title">Custom Options</string>
+    <string name="edit_vpn">Edit VPN Settings</string>
+    <string name="remove_vpn_query">Remove the VPN Profile %s?</string>
+    <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>
 </resources>