From 69f36a1ffafafc233291f44af0b7146428b764a3 Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Thu, 3 May 2012 11:05:51 +0200 Subject: extract settings string to ressource file. Fix calucation of netmaks Make p2p assumption message clearer closes issue #5 --- res/values-de/arrays.xml | 19 +++++++++++++++ res/values/strings.xml | 35 ++++++++++++++++++++++++++- res/xml/main_headers.xml | 9 ++++--- res/xml/vpn_authentification.xml | 18 +++++++------- res/xml/vpn_ipsettings.xml | 34 +++++++++++++------------- res/xml/vpn_obscure.xml | 8 +++--- src/de/blinkt/openvpn/ShowConfigFragment.java | 1 - src/de/blinkt/openvpn/VPNProfileList.java | 2 +- src/de/blinkt/openvpn/VpnProfile.java | 2 +- 9 files changed, 90 insertions(+), 38 deletions(-) diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index 06b26fa4..ad3ea97a 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -1,8 +1,27 @@ + 0 1 Unspezifiziert + + Zertifikate + PKCS12 Datei + Android Zertifikat Speicher + Benutzerame/Passwort + Statische Schlüssel + Nutzer/PW + Zertifikate + Nutzer/PW + PKCS12 + Nutzer/PW + Android + + + 0 - Kein Logging + 1 - Standard Logging + 2 - Ausführlicheres Logging + 3 + 4 + 5 - Debug Logging + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index c8e2b1e1..07268b0d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -69,6 +69,9 @@ LZO OpenSSL About + About Openvpn for Android + List of all configured VPNs + All your precious VPNs Type PKCS12 Password @@ -112,10 +115,40 @@ Enable Custom Options Specify custom options. Use with care! Route rejected by Android - Cannot make sense of %s and %s as IP and CIDR netmask, assuming P2P for local address (/32) + Cannot make sense of %s and %s as IP and CIDR netmask, assuming second address is peer address of remote. Using /32 netmask for local IP. cancel clear log Cancel Confirmation Disconnect the connected VPN/cancel the connection attempt? Remove VPN + Checks whether the server uses a TLS Server Certificate + Except TLS Server + Checks the Remote Server Certificate CN against a String + Certificate Hostname Check + Enter the String against which the remote Server is checked. Openvpn will use prefix matching. "Server" matches "Server-1" and "Server-2"\\nLeave empty to check the CN against the server hostname. + Remote Hostname(CN) + Enables the TLS Key Authentication + TLS Auth File + Requests IP addresses, routes and timing options from the server. + No information is requested from the server. Settings need to be specified below. + Pull Settings + DNS + Override DNS Settings by Server + Use your own DNS Servers + searchDomain + DNS Server to be used. + DNS Server to be used. + DNS Server + Secondary DNS Server used if the normal DNS Server cannot be reached. + Backup DNS Server + Ignore pushed routes + Ignore routed pushed by the server. + Redirects all Traffic over the VPN + Use default Route + Enter custom routes. Only enter destination in CIDR format. "10.0.0.0/8 2002::/16" would direct the networks 10.0.0.0/8 and 2002::/16 over the VPN. + Custom Routes + Log verbosity level + Allows authenticated packets from any IP + Allow floating server + Custom Options diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml index 7ea95848..0270f9bf 100644 --- a/res/xml/main_headers.xml +++ b/res/xml/main_headers.xml @@ -3,12 +3,13 @@
+ android:summary="@string/vpn_list_summary" + android:title="@string/vpn_list_title" />
+ android:summary="@string/about_summary" + android:title="@string/about" /> + \ No newline at end of file diff --git a/res/xml/vpn_authentification.xml b/res/xml/vpn_authentification.xml index ceeb514b..bd8d8ca5 100644 --- a/res/xml/vpn_authentification.xml +++ b/res/xml/vpn_authentification.xml @@ -3,29 +3,29 @@ + android:summary="@string/check_remote_tlscert" + android:title="@string/check_remote_tlscert_title" /> + android:summary="@string/remote_tlscn_check_summary" + android:title="@string/remote_tlscn_check_title" /> + android:title="@string/enter_tlscn_title" /> + android:title="@string/tls_auth_file" /> + android:title="@string/tls_direction" /> /> diff --git a/res/xml/vpn_ipsettings.xml b/res/xml/vpn_ipsettings.xml index a018321f..00774b65 100644 --- a/res/xml/vpn_ipsettings.xml +++ b/res/xml/vpn_ipsettings.xml @@ -4,9 +4,9 @@ + android:title="@string/use_pull" + android:summaryOn="@string/pull_on_summary" + android:summaryOff="@string/pull_off_summary" /> - + + android:summary="@string/dns_override_summary" + android:title="@string/override_dns" /> + android:title="@string/searchdomain" /> + android:dialogMessage="@string/dns1_summary" + android:title="@string/dns_server" /> + android:dialogMessage="@string/secondary_dns_message" + android:title="@string/backup_dns" /> + android:summary="@string/default_route_summary" + android:title="@string/use_default_title" /> + android:title="@string/custom_routes_title" /> \ No newline at end of file diff --git a/res/xml/vpn_obscure.xml b/res/xml/vpn_obscure.xml index 6c7d4983..44f71c52 100644 --- a/res/xml/vpn_obscure.xml +++ b/res/xml/vpn_obscure.xml @@ -7,7 +7,7 @@ android:entryValues="@array/verb_values" android:key="verblevel" android:persistent="false" - android:title="Log verbosity level" /> + android:title="@string/log_verbosity_level" /> + android:summary="@string/float_summary" + android:title="@string/float_title" />