summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-05-20 14:36:00 +0200
committerArne Schwabe <arne@rfc2549.org>2012-05-20 14:36:00 +0200
commite3152fa86cda600c3d993f8ddb43273f95aaa9f0 (patch)
tree6f00e49697c6553c4f319c0133e0ba2bf9500f6a /res
parentbb987226c843375a93043bbd5f78a94e0edea29d (diff)
- Fix missing about
- Fix vpn list saving to sharedpreferences (closes issue #27) - Version 0.5.5a
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml6
-rw-r--r--res/xml/main_headers.xml21
2 files changed, 17 insertions, 10 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0f1004a7..b6006103 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -210,7 +210,7 @@
<string name="import_done">Done reading config file.</string>
<string name="nobind_summary">Do not bind to local address and port</string>
<string name="no_bind">No local binding</string>
- <string name="import_experimental">Please not that the config importer is an experimental feature.</string>
+ <string name="import_experimental">Please not that the config importer is an experimental feature. If it does not work for you or you think that things could be done better please drop me a email.</string>
<string name="import_configuration_file">Import configuration file</string>
<string name="faq_security_title">Security considerations</string>
<string name="faq_security">"As openvpn is security sensitive a few notes about security are sensible. All data on the sdcard is inherently unsecure. Every app can read it (for example this program requires no special sd card rights). The data of this application can only be read by the application itself. By using the import option for cacert/cert/key in the file dialog the data is stored in the vpn profile. The vpn profiles are only accessable by this application. (Do not forget to delte the copies on the sdcard afterwards). Even though accessible only by this application the data is stil unecrypted. By rooting the telephone or other exploits it may be possible to retrieve the data. Saved passwords are stored in plain text as well. For pkcs12 files it is highly recommended that you import them into the android keystore."</string>
@@ -220,5 +220,7 @@
<string name="ipv4">IPv4</string>
<string name="ipv6">IPv6</string>
<string name="speed_waiting">Waiting for state messageā€¦</string>
- <string name="generalsettings">General Settings</string>
+ <string name="generalsettings">General Settings</string>
+ <string name="converted_profile">imported profile</string>
+ <string name="converted_profile_i">imported profile %d</string>
</resources>
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
index 95bc6fe3..030b5488 100644
--- a/res/xml/main_headers.xml
+++ b/res/xml/main_headers.xml
@@ -5,16 +5,21 @@
android:fragment="de.blinkt.openvpn.VPNProfileList"
android:summary="@string/vpn_list_summary"
android:title="@string/vpn_list_title" />
-
- <header
+
+ <!--
+ <header
+
+ android:fragment="de.blinkt.openvpn.GeneralSettings"
+ android:title="@string/generalsettings" />
+ -->
+
+ <header
android:fragment="de.blinkt.openvpn.FaqFragment"
android:summary="@string/faq_summary"
android:title="@string/faq" />
-
-<!-- <header
- android:fragment="de.blinkt.openvpn.GeneralSettings"
- android:title="@string/generalsettings" /> -->
-
-
+ <header
+ android:fragment="de.blinkt.openvpn.AboutFragment"
+ android:summary="@string/about_summary"
+ android:title="@string/about" />
</preference-headers> \ No newline at end of file