diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-07-30 20:43:49 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-07-30 20:43:49 +0200 |
| commit | d7ec9395e2f4118a00109a3bffb9fef49bc0f583 (patch) | |
| tree | 441bc96d698c2fb643a8d8642b66d6bd3586c6ae /res | |
| parent | ead513af3e9b408642a7ad41d2dfd2b24d78c665 (diff) | |
Use system proxy settings for openvpn
Diffstat (limited to 'res')
| -rw-r--r-- | res/values-de/strings.xml | 3 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/general_settings.xml | 5 |
3 files changed, 11 insertions, 1 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c7a80eed..8884b9e2 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -194,5 +194,6 @@ <string name="faq_system_dialogs_title">Warnung beim Verbinden und Benachrichtigungston</string> <string name="tun_error_helpful">Auf manchen ROM Version sind eventuell die Zugriffsrechte von /dev/tun falsch oder das tun Kernel Modul fehlt. Für Cyanogenmod 9 ROMs mit root gibt einen provisorischen Fix in den generellen Einstellungen.</string> <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> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6ad486a5..dcdeb095 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -237,4 +237,8 @@ <string name="setting_loadtun_summary">Try to load the tun.ko kernel module before trying to connect. Needs rooted devices.</string> <string name="setting_loadtun">Load tun module</string> <string name="importpkcs12fromconfig">Import PKCS12 from configuration into Android Keystore</string> + <string name="getproxy_error">Error getting proxy settings: %s</string> + <string name="using_proxy">Using proxy %1$s %2$d</string> + <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> </resources> diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml index 73b66b00..5a2be01d 100644 --- a/res/xml/general_settings.xml +++ b/res/xml/general_settings.xml @@ -16,6 +16,11 @@ android:key="statusafterconnect" android:summary="@string/keppstatus_summary" android:title="@string/keepstatus" /> + <CheckBoxPreference + android:defaultValue="true" + android:key="usesystemproxy" + android:summary="@string/use_system_proxy_summary" + android:title="@string/use_system_proxy" /> <PreferenceCategory android:title="Device specifics Hacks" > <CheckBoxPreference |