summaryrefslogtreecommitdiff
path: root/res/xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-03 22:51:47 +0200
commit815eb143e98b57b6cd1f43c7c3007416ed4b1a91 (patch)
tree2359f4fca5e51d2b7eb253728f62b74db7da0e69 /res/xml
parentb7b4e00536107c951a2642a2a1a3fe21a65510a0 (diff)
parent69f36a1ffafafc233291f44af0b7146428b764a3 (diff)
Merge Merge try number 2
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/main_headers.xml9
-rw-r--r--res/xml/vpn_authentification.xml18
-rw-r--r--res/xml/vpn_ipsettings.xml34
-rw-r--r--res/xml/vpn_obscure.xml8
4 files changed, 35 insertions, 34 deletions
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
index 7ea95848..0270f9bf 100644
--- a/res/xml/main_headers.xml
+++ b/res/xml/main_headers.xml
@@ -3,12 +3,13 @@
<header
android:fragment="de.blinkt.openvpn.VPNProfileList"
- android:summary="List of all configured VPNs"
- android:title="All your precious VPNs" />
+ android:summary="@string/vpn_list_summary"
+ android:title="@string/vpn_list_title" />
<header
android:fragment="de.blinkt.openvpn.AboutFragment"
- android:summary="About Openvpn for Android"
- android:title="About" />
+ android:summary="@string/about_summary"
+ android:title="@string/about" />
+
</preference-headers> \ No newline at end of file
diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml
index ceeb514b..bd8d8ca5 100644
--- a/res/xml/vpn_authentification.xml
+++ b/res/xml/vpn_authentification.xml
@@ -3,29 +3,29 @@
<CheckBoxPreference
android:key="remoteServerTLS"
- android:summary="Checks whether the server uses a TLS Server Certificate"
- android:title="Except TLS Server" />
+ android:summary="@string/check_remote_tlscert"
+ android:title="@string/check_remote_tlscert_title" />
<CheckBoxPreference
android:key="checkRemoteCN"
- android:summary="Checks the Remote Server Certificate CN against a String"
- android:title="Certificate Hostname Check" />
+ android:summary="@string/remote_tlscn_check_summary"
+ android:title="@string/remote_tlscn_check_title" />
<EditTextPreference
android:dependency="checkRemoteCN"
- android:dialogMessage="Enter the String against which the remote Server is checked. Openvpn will use prefix matching. &quot;Server&quot; matches &quot;Server-1&quot; and &quot;Server-2&quot;\nLeave empty to check the CN against the server hostname."
+ android:dialogMessage="@string/enter_tlscn_dialog"
android:key="remotecn"
- android:title="Remote Hostname(CN)" />
+ android:title="@string/enter_tlscn_title" />
<PreferenceCategory android:title="TLS Authentication" >
<SwitchPreference
android:key="useTLSAuth"
- android:summary="Enables the TLS Key Authentication"
+ android:summary="@string/tls_key_auth"
android:title="@string/useTLSAuth" />
<Preference
android:dependency="useTLSAuth"
android:key="tlsAuthFile"
- android:title="TLS Auth File" />
+ android:title="@string/tls_auth_file" />
<ListPreference
android:entries="@array/tls_directions_entries"
@@ -34,7 +34,7 @@
android:entryValues="@array/tls_directions_values"
android:key="tls_direction"
android:persistent="false"
- android:title="TLS Direction" />
+ android:title="@string/tls_direction" />
</PreferenceCategory>
/>
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index a018321f..00774b65 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -4,9 +4,9 @@
<SwitchPreference
android:disableDependentsState="true"
android:key="usePull"
- android:title="Pull Settings"
- android:summaryOn="Requests IP addresses, routes and timing options from the server."
- android:summaryOff="No information is requested from the server. Settings need to be specified below." />
+ android:title="@string/use_pull"
+ android:summaryOn="@string/pull_on_summary"
+ android:summaryOff="@string/pull_off_summary" />
<PreferenceCategory android:title="IP" >
<EditTextPreference
@@ -20,42 +20,42 @@
android:key="ipv6_address"
android:title="@string/ipv6_address" />
</PreferenceCategory>
- <PreferenceCategory android:title="DNS" >
+ <PreferenceCategory android:title="@string/dns" >
<CheckBoxPreference
android:key="overrideDNS"
- android:summary="Override DNS Settings by Server"
- android:title="Override DNS Settings" />
+ android:summary="@string/dns_override_summary"
+ android:title="@string/override_dns" />
<EditTextPreference
android:key="searchdomain"
- android:title="searchDomain" />
+ android:title="@string/searchdomain" />
<EditTextPreference
android:key="dns1"
- android:dialogMessage="DNS Server to be used."
- android:title="DNS Server" />
+ android:dialogMessage="@string/dns1_summary"
+ android:title="@string/dns_server" />
<EditTextPreference
android:key="dns2"
- android:dialogMessage="Secondary DNS Server used if the normal DNS Server cannot be reached."
- android:title="Backup DNS Server" />
+ android:dialogMessage="@string/secondary_dns_message"
+ android:title="@string/backup_dns" />
</PreferenceCategory>
<PreferenceCategory android:title="Routing" >
<CheckBoxPreference
- android:title="Ignore pushed routes"
+ android:title="@string/ignored_pushed_routes"
android:key="routenopull"
- android:summary="Ignore routed pushed by the server."
+ android:summary="@string/ignore_routes_summary"
/>
<CheckBoxPreference
android:disableDependentsState="true"
android:key="useDefaultRoute"
- android:summary="Redirects all Traffic over the VPN"
- android:title="Use default Route" />
+ android:summary="@string/default_route_summary"
+ android:title="@string/use_default_title" />
<EditTextPreference
android:dependency="useDefaultRoute"
- android:dialogMessage="Enter custom routes. Only enter destination in CIDR format. &quot;10.0.0.0/8 2002::/16&quot; would direct the networks 10.0.0.0/8 and 2002::/16 over the VPN."
+ android:dialogMessage="@string/custom_route_message"
android:key="customRoutes"
- android:title="Custom Routes" />
+ android:title="@string/custom_routes_title" />
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file
diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml
index 6c7d4983..44f71c52 100644
--- a/res/xml/vpn_obscure.xml
+++ b/res/xml/vpn_obscure.xml
@@ -7,7 +7,7 @@
android:entryValues="@array/verb_values"
android:key="verblevel"
android:persistent="false"
- android:title="Log verbosity level" />
+ android:title="@string/log_verbosity_level" />
<CheckBoxPreference
android:key="useRandomHostname"
@@ -17,8 +17,8 @@
<CheckBoxPreference
android:key="useFloat"
android:persistent="false"
- android:summary="Allows authenticated packets from any IP"
- android:title="Allow floating server" />
+ android:summary="@string/float_summary"
+ android:title="@string/float_title" />
<!--
<CheckBoxPreference android:key="setmtu" android:title="Set custom MTU" />
@@ -62,7 +62,7 @@
android:dialogMessage="@string/custom_option_warning"
android:key="customOptions"
android:persistent="false"
- android:title="Custom Options" />
+ android:title="@string/custom_options_title" />
</PreferenceCategory>
</PreferenceScreen> \ No newline at end of file