summaryrefslogtreecommitdiff
path: root/res/xml/vpn_ipsettings.xml
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-18 00:06:49 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-18 00:06:49 +0200
commit7ad69e645000fc66951a79104b0ce5ac3478b9f3 (patch)
treeabc5069ab0559e074436fcb58f5ac5bb6e7fc6ed /res/xml/vpn_ipsettings.xml
parent39e94d54313cf140929339a9f2613d79cbf734b0 (diff)
- Make Ipv6 support complete (minus tun-ipv6 warning)
- Implement byte counter support in the log window - Fix spelling of secret (closes issue #22) - Replace &quot;quot; with &quot;, no idea what went wrong there (closes issue #21)
Diffstat (limited to 'res/xml/vpn_ipsettings.xml')
-rw-r--r--res/xml/vpn_ipsettings.xml41
1 files changed, 11 insertions, 30 deletions
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index fe55e8b4..e482f8f1 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="@string/use_pull"
+ android:summaryOff="@string/pull_off_summary"
android:summaryOn="@string/pull_on_summary"
- android:summaryOff="@string/pull_off_summary" />
+ android:title="@string/use_pull" />
<PreferenceCategory android:title="IP" >
<EditTextPreference
@@ -17,15 +17,15 @@
<EditTextPreference
android:dependency="usePull"
android:dialogMessage="@string/ipv6_dialog_tile"
+ android:enabled="false"
android:key="ipv6_address"
- android:title="@string/ipv6_address"
- android:enabled="false"/>
- <CheckBoxPreference
- android:title="@string/no_bind"
- android:summary="@string/nobind_summary"
- android:persistent="false"
- android:key="nobind" />
+ android:title="@string/ipv6_address" />
+ <CheckBoxPreference
+ android:key="nobind"
+ android:persistent="false"
+ android:summary="@string/nobind_summary"
+ android:title="@string/no_bind" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/dns" >
<CheckBoxPreference
@@ -37,32 +37,13 @@
android:key="searchdomain"
android:title="@string/searchdomain" />
<EditTextPreference
- android:key="dns1"
android:dialogMessage="@string/dns1_summary"
+ android:key="dns1"
android:title="@string/dns_server" />
<EditTextPreference
- android:key="dns2"
android:dialogMessage="@string/secondary_dns_message"
+ android:key="dns2"
android:title="@string/backup_dns" />
</PreferenceCategory>
- <PreferenceCategory android:title="Routing" >
- <CheckBoxPreference
- android:title="@string/ignored_pushed_routes"
- android:key="routenopull"
- android:summary="@string/ignore_routes_summary"
-
- />
- <CheckBoxPreference
- android:disableDependentsState="true"
- android:key="useDefaultRoute"
- android:summary="@string/default_route_summary"
- android:title="@string/use_default_title" />
-
- <EditTextPreference
- android:dependency="useDefaultRoute"
- android:dialogMessage="@string/custom_route_message"
- android:key="customRoutes"
- android:title="@string/custom_routes_title" />
- </PreferenceCategory>
</PreferenceScreen> \ No newline at end of file