summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-08-12 18:52:38 +0200
committerArne Schwabe <arne@rfc2549.org>2012-08-12 18:52:38 +0200
commitbbf93681fe1383c06edc47c89b50d444df57e56b (patch)
treedef0ecbcf1a22ccacbfcf604d6bd034e650031f6 /res
parent531aadf63b30cdde3604e583a3df03dcbd4521d8 (diff)
Implement starting a VPN on boot. (closes issue #62)
Diffstat (limited to 'res')
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values/strings.xml2
-rw-r--r--res/xml/general_settings.xml6
3 files changed, 10 insertions, 0 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8884b9e2..f5c9c1f8 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -196,4 +196,6 @@
<string name="importpkcs12fromconfig">Importiere die PKCS12 Datei, die in der Konfiguration angegeben ist, in den Android Keystore</string>
<string name="use_system_proxy">Benutze System Proxies</string>
<string name="use_system_proxy_summary">Benutze die System weiten Einstellungen für HTTP/HTTPS Proxies beim Verbinden.</string>
+ <string name="onbootrestartsummary">Openvpn wird bei einem Neustart des Telefon das beim herrunterfahren/neu starten aktive VPN weider verbinden. Bitte lesen Sie die FAQ &quot;Warnung beim Verbinden&quot; FAQ bevor Sie diese Option verwenden.</string>
+ <string name="onbootrestart">Nach Neustart verbinden</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3627f30a..d18c9563 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -242,4 +242,6 @@
<string name="use_system_proxy">Use system proxy</string>
<string name="use_system_proxy_summary">Use the system wide configuration for HTTP/HTTPS proxies to connect.</string>
<string name="donatewithpaypal">You can &lt;a href=\"https://www.paypal.com/cgi-bin/webscr?hosted_button_id=R2M6ZP9AF25LS&amp;amp;cmd=_s-xclick\">donate with PayPal&lt;/a> </string>
+ <string name="onbootrestartsummary">OpenVPN will reconnect a VPN if it was active on system reboot/shutdown. Please read the Connection warning FAQ before using this option.</string>
+ <string name="onbootrestart">Reconnect on reboot</string>
</resources>
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 5a2be01d..3013963d 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -21,6 +21,11 @@
android:key="usesystemproxy"
android:summary="@string/use_system_proxy_summary"
android:title="@string/use_system_proxy" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="restartvpnonboot"
+ android:summary="@string/onbootrestartsummary"
+ android:title="@string/onbootrestart" />
<PreferenceCategory android:title="Device specifics Hacks" >
<CheckBoxPreference
@@ -35,4 +40,5 @@
android:title="@string/setting_loadtun" />
</PreferenceCategory>
+
</PreferenceScreen> \ No newline at end of file