summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorschwabe <none@none>2012-04-29 15:22:01 +0200
committerschwabe <none@none>2012-04-29 15:22:01 +0200
commit9a6b3b13a6ea67543173bacbc8e01ade44a1382f (patch)
treea40f9151d8bd58ec0c39835168f268101d5a4104 /res
parent6dbfffefaf70609ac5bb7b3ebd71a0258427360a (diff)
Version 0.4
fixes iusse #1 fixes iusse #2 fixes iusse #3
Diffstat (limited to 'res')
-rw-r--r--res/values-de/arrays.xml6
-rw-r--r--res/values/arrays.xml10
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/main_headers.xml2
-rw-r--r--res/xml/vpn_authentification.xml15
-rw-r--r--res/xml/vpn_ipsettings.xml8
6 files changed, 23 insertions, 20 deletions
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 80244f3f..06b26fa4 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string-array name="tls_directions">
+ <string-array name="tls_directions_entries">
<item>0</item>
<item>1</item>
- <item>Nicht spezifiziert</item>
+ <item>Unspezifiziert</item>
</string-array>
-
-
</resources> \ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 51b727e4..f4651fd2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -17,18 +17,16 @@
</string-array>
- <string-array name="tls_directions">
+ <string-array name="tls_directions_entries">
<item>0</item>
<item>1</item>
<item>Unspecified</item>
</string-array>
- <string-array name="tls_directions_entries">
+ <string-array name="tls_directions_values">
<item>0</item>
<item>1</item>
- <item>GNA</item>
+ <item></item>
</string-array>
-
-
-
+
</resources> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89159094..a837840e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,4 +101,6 @@
<string name="no_error_found">No error found</string>
<string name="config_error_found">Error in Configuration</string>
<string name="config_error_message">An error has been found in your VPN configuration:</string>
+ <string name="ipv4_format_error">Cannot parse the IPv4 address</string>
+ <string name="custom_route_format_error">Cannot parse the custom routes</string>
</resources>
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
index a0c4f432..7ea95848 100644
--- a/res/xml/main_headers.xml
+++ b/res/xml/main_headers.xml
@@ -3,7 +3,7 @@
<header
android:fragment="de.blinkt.openvpn.VPNProfileList"
- android:summary="List of all VPN, confusing to be here :)"
+ android:summary="List of all configured VPNs"
android:title="All your precious VPNs" />
<header
android:fragment="de.blinkt.openvpn.AboutFragment"
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml
index 0444831b..ceeb514b 100644
--- a/res/xml/vpn_authentification.xml
+++ b/res/xml/vpn_authentification.xml
@@ -25,16 +25,17 @@
<Preference
android:dependency="useTLSAuth"
android:key="tlsAuthFile"
- android:title="Title Auth File" />
+ android:title="TLS Auth File" />
<ListPreference
- android:dependency="useTLSAuth"
- android:dialogMessage="Select the direction for TLS Auth."
- android:entries="@array/tls_directions"
- android:entryValues="@array/tls_directions_entries"
+ android:entries="@array/tls_directions_entries"
+ android:dependency="useTLSAuth"
+
+ android:entryValues="@array/tls_directions_values"
android:key="tls_direction"
- android:title="TLS Direction"
- android:persistent="false"/>
+ android:persistent="false"
+ android:title="TLS Direction" />
</PreferenceCategory>
+/>
</PreferenceScreen> \ No newline at end of file
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index 79356e69..a018321f 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -40,8 +40,12 @@
</PreferenceCategory>
<PreferenceCategory android:title="Routing" >
<CheckBoxPreference
- android:defaultValue="true"
- android:dependency="usePull"
+ android:title="Ignore pushed routes"
+ android:key="routenopull"
+ android:summary="Ignore routed pushed by the server."
+
+ />
+ <CheckBoxPreference
android:disableDependentsState="true"
android:key="useDefaultRoute"
android:summary="Redirects all Traffic over the VPN"