From d610ab48595800ccd6393fbb24a6b36bdfb1ef1a Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Fri, 12 Dec 2014 16:53:49 +0100 Subject: fix typos, fix faq --HG-- extra : rebase_source : 77b367a3862b90094fc3145d841408519b1752b0 --- main/misc/genFAQ.py | 2 ++ main/src/main/res/values/strings.xml | 13 ++++++------- 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 @@ + --> - OpenVPN for Android Server Address: Server Port: @@ -174,14 +173,14 @@ Turning this option on will force a reconnect if the network state is changed (e.g. WiFi to/from mobile) Reconnect on network change Network Status: %s - The CA cert is usually returned from the Android Keystore. Specify a separate certificate if you get certificate verification errors. + The CA cert is usually returned from the Android keystore. Specify a separate certificate if you get certificate verification errors. Select - No CA Certificate returned while reading from Android keystore. Auhtentication will probably fail. + No CA Certificate returned while reading from Android keystore. Authentication will probably fail. Shows the log window on connect. The log window can always be accessed from the notification status. Show log window Running on %1$s (%2$s) %3$s, Android API %4$d Error signing with Android keystore key %1$s: %2$s - 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) + 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) Connection warning and notification sound English translation by Arne Schwabe<arne@rfc2549.org> IP and DNS @@ -314,7 +313,7 @@ %3$s: %1$s\n\n%2$s If you have rooted your Android device you can install the <a href=\"http://xposed.info/\">Xposed framework</a> and a the <a href=\"http://repo.xposed.info/module/de.blinkt.vpndialogxposed\">VPN Dialog confirm module</a> at your own risk" Full licenses - 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. + 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. Bypass VPN for local networks Username/Password file [Imported from: %s] @@ -322,7 +321,7 @@ 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. Import log: Vpn topology \"%3$s\" specified but ifconfig %1$s %2$s looks more like an IP address with a network mask. Assuming \"subnet\" topology. - mssfix value has to be a integer between 0 and 9000 + The MSS override value has to be a integer between 0 and 9000 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) Override MSS value of TCP payload Set MSS of TCP payload -- cgit v1.2.3