summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rwxr-xr-xres/values/strings.xml4
-rw-r--r--res/xml/general_settings.xml17
2 files changed, 12 insertions, 9 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56dde3a8..de9bbcb3 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -278,5 +278,9 @@
<string name="no_external_app_allowed">No app allowed to use external API</string>
<string name="allowed_apps">Allowed apps: %s</string>
<string name="clearappsdialog">Clear list of allowed external apps?\nCurrent list of allowed apps:\n\n%s</string>
+ <string name="screenoff_summary">"Pause VPN when screen is off and less than 64 kB transferred data in 60s."</string>
+ <string name="screenoff_title">Pause VPN connection after screen off</string>
+ <string name="screenoff_pause">Pausing connection in screen off state: less than %1$s in %2$ss</string>
+ <string name="screen_nopersistenttun">ERROR: Persistent tun not enabled for this VPN. Ignoring option to pause VPN when screen is off</string>
</resources> \ No newline at end of file
diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml
index 6dbf58bf..9aa62956 100644
--- a/res/xml/general_settings.xml
+++ b/res/xml/general_settings.xml
@@ -11,13 +11,6 @@
android:key="showlogwindow"
android:summary="@string/show_log_summary"
android:title="@string/show_log_window" />
- <!--
- <CheckBoxPreference
- android:defaultValue="false"
- android:key="statusafterconnect"
- android:summary="@string/keppstatus_summary"
- android:title="@string/keepstatus" />
- -->
<CheckBoxPreference
android:defaultValue="true"
android:key="usesystemproxy"
@@ -28,11 +21,17 @@
android:key="restartvpnonboot"
android:summary="@string/onbootrestartsummary"
android:title="@string/onbootrestart" />
+
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="screenoff"
+ android:summary="@string/screenoff_summary"
+ android:title="@string/screenoff_title" />
<Preference
android:key="clearapi"
- android:title="Clear allowed external apps"
- android:persistent="false" />
+ android:persistent="false"
+ android:title="Clear allowed external apps" />
<PreferenceCategory android:title="Device specifics Hacks" >
<CheckBoxPreference