summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-18 14:11:37 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-18 14:11:37 +0200
commit94387a6e42cf76d8fcaa5f9aab0355164d0bbe2b (patch)
treef1433083ca238930bf3b8167d6c38a7a3cacb2ec /res
parent7ad69e645000fc66951a79104b0ce5ac3478b9f3 (diff)
Allow only one log window at a time (closes issue #26)
Make OpenvpnService honour net30 routes (closes issue #24)
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml5
-rw-r--r--res/xml/vpn_headers.xml8
2 files changed, 5 insertions, 8 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f0557545..c74362e7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -165,7 +165,7 @@
<string name="dns_domain_info">DNS Domain: %s</string>
<string name="routes_info">Routes: %s</string>
<string name="routes_info6">Routes Ipv6: %s</string>
- <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP.</string>
+ <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP. Mode given by openvpn is \"%3$s\".</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>
<string name="keychain_access">Cannot accces the Android Keychain Certificates. If you restored a backup of the app/app settings reselect the certificate to recreate the permission to access the certificate.</string>
@@ -219,6 +219,5 @@
<string name="broken_image_cert">Got an excption trying to show the Android 4.0+ certificate selction dialog. This should never happens as this a standard feature of Android 4.0+. Maybe your Android ROM support for certificate storage is broken</string>
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
- <string name="use_default_titlev6">TODO</string>
- <string name="speed_waiting">Waiting byte count message</string>
+ <string name="speed_waiting">Waiting for byte count messageā€¦</string>
</resources>
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index 3762d445..c840e6ab 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -4,14 +4,12 @@
<header
android:id="@+id/basicsettingsid"
android:fragment="de.blinkt.openvpn.Settings_Basic"
- android:tag="BasicSettings"
- android:title="Basic Settings" />
+ android:title="Basic" />
<!-- android:icon="@drawable/ic_settings_applications" -->
<header
android:fragment="de.blinkt.openvpn.Settings_IP"
- android:summary="IP Address"
- android:title="IP Settings" />
+ android:title="IP and DNS" />
<header
android:fragment="de.blinkt.openvpn.Settings_Routing"
android:title="Routing" />
@@ -23,7 +21,7 @@
<header
android:fragment="de.blinkt.openvpn.Settings_Obscure"
android:summary="Obscure OpenVPN Settings. Normally not needed."
- android:title="Obscure" >
+ android:title="Advanced" >
</header>
<header
android:fragment="de.blinkt.openvpn.ShowConfigFragment"