diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-03 22:51:47 +0200 |
| commit | 2b3ea917b0a830e3ff4817c7240e0f1808ae58bc (patch) | |
| tree | 2359f4fca5e51d2b7eb253728f62b74db7da0e69 /res/values/strings.xml | |
| parent | 9cd2069d5d57fc605a8eae3e6f8a0b09b56d4c16 (diff) | |
| parent | d3c50d3637462d4e3e3a3c09d43d37ce5656f67a (diff) | |
Merge Merge try number 2
Diffstat (limited to 'res/values/strings.xml')
| -rw-r--r-- | res/values/strings.xml | 9 |
1 files changed, 7 insertions, 2 deletions
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> |