diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-10-11 23:16:28 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-10-11 23:16:28 +0200 |
| commit | ad0103151b148a6fd504a0bf90dff13d22868aaa (patch) | |
| tree | 0cea980bdbda3db5eed54cd57e7b61c9615efd74 | |
| parent | 0a4272c0cb8b33b3eb86372c2aa8449b46d2d1ed (diff) | |
Don't give myself credit.
| -rw-r--r-- | res/values/strings.xml | 1 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/MainActivity.java | 4 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/VPNPreferences.java | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4943aab0..2625a028 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -224,4 +224,5 @@ <string name="faq_routing">The Routing and interface configuration is not done via traditionell ifconfig/route command but by using the VPNService API. This results in a different routing configuration than on other OSes. The configuration only consists of the IP of the tunnel interface and the networks that should be routed over this interface. Especially no peer partner address or gateway address is needed. Special routes to reach the VPN Server (for example added when using redirect-gateway) are not needed either. The application will consequently ignore these settings when importing a configuration. The app ensures with the VPNService API that the connection to the server is not routed through the VPN tunnel. Since only specifing networks to be routed via tunnel is supported extra routes not pointing to the tunnel cannot be supported either. (e.g. route x.x.x.x y.y.y.y net_gateway). The show information button in the log windows show the current configuration of the VPNService network configuration.</string> <string name="persisttun_summary">Do not fallback to no VPN connection when OpenVPN is reconnecting.</string> <string name="persistent_tun_title">Persistent tun</string> + <string name="translation">Translation</string> </resources> diff --git a/src/de/blinkt/openvpn/MainActivity.java b/src/de/blinkt/openvpn/MainActivity.java index 63745cce..9b329817 100644 --- a/src/de/blinkt/openvpn/MainActivity.java +++ b/src/de/blinkt/openvpn/MainActivity.java @@ -13,9 +13,9 @@ public class MainActivity extends PreferenceActivity { String translatedby = getString(R.string.translationby); - if(!translatedby.equals("")) { + if(!translatedby.equals("") && !translatedby.contains("Arne Schwabe")) { Header translation = new Header(); - translation.title = "Translation"; + translation.title = getString(R.string.translation); translation.summary = translatedby; target.add(translation); } diff --git a/src/de/blinkt/openvpn/VPNPreferences.java b/src/de/blinkt/openvpn/VPNPreferences.java index 549afa23..c49d39de 100644 --- a/src/de/blinkt/openvpn/VPNPreferences.java +++ b/src/de/blinkt/openvpn/VPNPreferences.java @@ -60,8 +60,6 @@ public class VPNPreferences extends PreferenceActivity { setResult(VPNProfileList.RESULT_VPN_DELETED); finish(); } - - } @Override |