summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-13 01:16:27 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-13 01:16:27 +0200
commit9e2afc72b16125f7c365b8d600f6f5df36aa8f48 (patch)
treef2733212c02f8816a6188c70fd0e358876b90d0e /res
parent5a65e0c5e80d147909acffa14b04d3c99d48de1a (diff)
Config Import useable (closes issue #14)
Correct save/restore state in Basic Settings (closes issue #17)
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/ic_menu_archive.pngbin0 -> 1094 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_archive.pngbin0 -> 831 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_archive.pngbin0 -> 1398 bytes
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/vpn_ipsettings.xml9
5 files changed, 13 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_menu_archive.png b/res/drawable-hdpi/ic_menu_archive.png
new file mode 100644
index 00000000..e2d9bc1a
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_archive.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_archive.png b/res/drawable-mdpi/ic_menu_archive.png
new file mode 100644
index 00000000..49ac569d
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_archive.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_archive.png b/res/drawable-xhdpi/ic_menu_archive.png
new file mode 100644
index 00000000..b1be9d5b
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_archive.png
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5a88219..e2121d4b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -206,5 +206,9 @@
<string name="importing_config">Importing config file from source %1$s</string>
<string name="import_pkcs12_to_keystore">Your config file specified a pkcs12 file. Please import the file by selecting select in the Basic Settings configuration of the converted VPN</string>
<string name="import_warning_custom_options">Your configuration had a few configuration options that could be parsed. These options were added as custom configuration options. The custom configuration is displayed below:</string>
- <string name="import_done">Done reading config file.</string>
+ <string name="import_done">Done reading config file.</string>
+ <string name="nobind_summary">Do not bind to local address and port</string>
+ <string name="no_bind">No local binding</string>
+ <string name="import_experimental">Please not that the config importer is an experimental feature.</string>
+ <string name="import_configuration_file">Import configuration file</string>
</resources>
diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml
index 00774b65..fe55e8b4 100644
--- a/res/xml/vpn_ipsettings.xml
+++ b/res/xml/vpn_ipsettings.xml
@@ -18,7 +18,14 @@
android:dependency="usePull"
android:dialogMessage="@string/ipv6_dialog_tile"
android:key="ipv6_address"
- android:title="@string/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" />
+
</PreferenceCategory>
<PreferenceCategory android:title="@string/dns" >
<CheckBoxPreference