summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-12-12 16:53:49 +0100
committerArne Schwabe <arne@rfc2549.org>2014-12-12 16:53:49 +0100
commitd610ab48595800ccd6393fbb24a6b36bdfb1ef1a (patch)
tree852e6b579ba9fd4bf96bffa1caf85d28f1662d8b /main
parentb55e5aa6bc2373667fbe15744ea601633be56759 (diff)
fix typos, fix faq
--HG-- extra : rebase_source : 77b367a3862b90094fc3145d841408519b1752b0
Diffstat (limited to 'main')
-rwxr-xr-xmain/misc/genFAQ.py2
-rwxr-xr-xmain/src/main/res/values/strings.xml13
2 files changed, 8 insertions, 7 deletions
diff --git a/main/misc/genFAQ.py b/main/misc/genFAQ.py
index e5c6d328..9a0c9af5 100755
--- a/main/misc/genFAQ.py
+++ b/main/misc/genFAQ.py
@@ -41,6 +41,8 @@ def genPage(javafile, lang):
out += "== %s ==\n" % getString(title,lang)
out += "%s\n" % getString(body,lang)
+ if body == "faq_system_dialogs_title":
+ out += "%s\n" % getString("faq_system_dialog_xposed",lang)
return out
def genPageXML(faqdom,lang):
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 019ac56f..99cf503b 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <!--
~ Copyright (c) 2012-2014 Arne Schwabe
~ Distributed under the GNU GPL v2. For full terms see the file doc/LICENSE.txt
- --> <!-- Generated by crowdin.net -->
+ -->
<resources>
-
<string name="app">OpenVPN for Android</string>
<string name="address">Server Address:</string>
<string name="port">Server Port:</string>
@@ -174,14 +173,14 @@
<string name="netchange_summary">Turning this option on will force a reconnect if the network state is changed (e.g. WiFi to/from mobile)</string>
<string name="netchange">Reconnect on network change</string>
<string name="netstatus">Network Status: %s</string>
- <string name="extracahint">The CA cert is usually returned from the Android Keystore. Specify a separate certificate if you get certificate verification errors.</string>
+ <string name="extracahint">The CA cert is usually returned from the Android keystore. Specify a separate certificate if you get certificate verification errors.</string>
<string name="select_file">Select</string>
- <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Auhtentication will probably fail.</string>
+ <string name="keychain_nocacert">No CA Certificate returned while reading from Android keystore. Authentication will probably fail.</string>
<string name="show_log_summary">Shows the log window on connect. The log window can always be accessed from the notification status.</string>
<string name="show_log_window">Show log window</string>
<string name="mobile_info">Running on %1$s (%2$s) %3$s, Android API %4$d</string>
<string name="error_rsa_sign">Error signing with Android keystore key %1$s: %2$s</string>
- <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialogs for your own safety and made sure that they cannot be circumenvented. (On some images this unfortunely includes a notifciation sound)</string>
+ <string name="faq_system_dialogs">The VPN connection warning telling you that this app can intercept all traffic is imposed by the system to prevent abuse of the VPNService API.\nThe VPN connection notification (The key symbol) is also imposed by the Android system to signal an ongoing VPN connection. On some images this notification plays a sound.\nAndroid introduced these system dialogs for your own safety and made sure that they cannot be circumvented. (On some images this unfortunately includes a notification sound)</string>
<string name="faq_system_dialogs_title">Connection warning and notification sound</string>
<string name="translationby">English translation by Arne Schwabe&lt;arne@rfc2549.org&gt;</string>
<string name="ipdns">IP and DNS</string>
@@ -314,7 +313,7 @@
<string name="unhandled_exception_context">%3$s: %1$s\n\n%2$s</string>
<string name="faq_system_dialog_xposed">If you have rooted your Android device you can install the &lt;a href=\"http://xposed.info/\"&gt;Xposed framework&lt;/a&gt; and a the &lt;a href=\"http://repo.xposed.info/module/de.blinkt.vpndialogxposed\"&gt;VPN Dialog confirm module&lt;/a&gt; at your own risk"</string>
<string name="full_licenses">Full licenses</string>
- <string name="blocklocal_summary">Networks directly connected to the local interfaces will not be routed over the VPN. Unchecking this option will redirect all traffic indented for local networks to VPN.</string>
+ <string name="blocklocal_summary">Networks directly connected to the local interfaces will not be routed over the VPN. Deselecting this option will redirect all traffic indented for local networks to the VPN.</string>
<string name="blocklocal_title">Bypass VPN for local networks</string>
<string name="userpw_file">Username/Password file</string>
<string name="imported_from_file">[Imported from: %s]</string>
@@ -322,7 +321,7 @@
<string name="openvpn_is_no_free_vpn">To use this app you need a VPN provider/VPN gateway supporting OpenVPN (often provided by your employer). Check out http://community.openvpn.net/ for more information on OpenVPN and how to setup your own OpenVPN server.</string>
<string name="import_log">Import log:</string>
<string name="ip_looks_like_subnet">Vpn topology \"%3$s\" specified but ifconfig %1$s %2$s looks more like an IP address with a network mask. Assuming \"subnet\" topology.</string>
- <string name="mssfix_invalid_value">mssfix value has to be a integer between 0 and 9000</string>
+ <string name="mssfix_invalid_value">The MSS override value has to be a integer between 0 and 9000</string>
<string name="mssfix_value_dialog">Announce to TCP sessions running over the tunnel that they should limit their send packet sizes such that after OpenVPN has encapsulated them, the resulting UDP packet size that OpenVPN sends to its peer will not exceed this number of bytes. (default is 1450)</string>
<string name="mssfix_checkbox">Override MSS value of TCP payload</string>
<string name="mssfix_dialogtitle">Set MSS of TCP payload</string>