diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-12-15 23:06:18 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-12-15 23:06:18 +0100 |
| commit | e6bad64bdfde2be997020f22d8e5a129173140f3 (patch) | |
| tree | 2b8e20d361c44f31d1270f94241baf20dd5381c6 /res/values | |
| parent | 5b67397a2bdd046cc05daef3ca57ef89ba794dd1 (diff) | |
Let the user control the new connect-retry(-max) logic
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rwxr-xr-x | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/values/untranslatable.xml | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index b88e975e..4af8f90f 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -24,5 +24,11 @@ <item>4</item> <item>5 - Debug logging</item> </string-array> - + <string-array name="crm_entries" translatable="false"> + <item>No reconnection retries</item> + <item>One reconnection retry</item> + <item>Five reconnection retries</item> + <item>Fifty reconnection retries</item> + <item>Unlimited reconnection retries</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 74d05fb5..ff0c592c 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -232,5 +232,9 @@ <string name="baterry_consumption">In my personal tests the main reason for high battery consumption of OpenVPN are the keepalive packets. Most OpenVPN servers have a configuration directive like \'keepalive 10 60\' which translates to a keepalive packet from client to server and server to client every ten seconds. <p> While these packets are small and do not use much traffic, they keep the mobile radio network busy and increase the energy consumption. <p> This keepalive setting cannot be changed on the client. Only the system administrator of the OpenVPN can change the setting. <p> Unfortunatly using a keepalive larger than 60 seconds with udp has problems with some NAT gateways which terminate the state for a connnection after a short timeout (60s in my tests). Using TCP with long keepalive timeout works but has the TCP over TCP problem. (See <a href=\"http://sites.inka.de/bigred/devel/tcp-tcp.html\">Why TCP Over TCP Is A Bad Ide</a>)</string> <string name="faq_tethering">The Android Tethering feature (over WiFi, USB or Bluetooth) and the VPNService API (used by this program) do not work together. For more details see the <a href=\"http://code.google.com/p/ics-openvpn/issues/detail?id=34\">issue #34</a></string> <string name="vpn_tethering_title">VPN and Tethering</string> + <string name="connection_retries">Connection retries</string> + <string name="reconnection_settings">Reconnection settings</string> + <string name="connectretrymessage">Number of seconds to wait between connection attempts.</string> + <string name="connectretrywait">Seconds between connections</string> </resources>
\ No newline at end of file diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml index cb5bea14..d5a30a03 100644 --- a/res/values/untranslatable.xml +++ b/res/values/untranslatable.xml @@ -31,5 +31,11 @@ <item>4</item> <item>5</item> </string-array> - -</resources> + <string-array name="crm_values" translatable="false"> + <item>1</item> + <item>2</item> + <item>5</item> + <item>50</item> + <item>-1</item> + </string-array> + </resources> |