From 6b2edc5d2bb43c4494653739ec1266790334b2ed Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 13 May 2012 22:51:52 +0200
Subject: Implement the required ipv6 changes. GUI part is still incomplete

---
 res/menu/import_menu.xml | 2 +-
 res/values/strings.xml   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/menu/import_menu.xml b/res/menu/import_menu.xml
index 27498da3..c29db10e 100644
--- a/res/menu/import_menu.xml
+++ b/res/menu/import_menu.xml
@@ -6,7 +6,7 @@
         android:icon="@android:drawable/ic_menu_save"
         android:showAsAction="ifRoom|withText"
         android:title="@string/add_profile"
-        android:titleCondensed="@string/clear"/>
+        android:titleCondensed="@string/import_vpn"/>
     <item
         android:id="@+id/cancel"
         android:icon="@android:drawable/ic_menu_close_clear_cancel"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 41f229de..9b0c8f23 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -160,10 +160,11 @@
     <string name="info">info</string>
     <string name="show_connection_details">Show connection details</string>
     <string name="last_openvpn_tun_config">Last interface configuration from Openvpn:</string>
-    <string name="local_ip_info">Local IP: %1$s/%2$d MTU: %3$d</string>
+    <string name="local_ip_info">Local IPv4: %1$s/%2$d IPv6: %3$s MTU: %4$d</string>
     <string name="dns_server_info">DNS Server: %s</string>
     <string name="dns_domain_info">DNS Domain: %s</string>
     <string name="routes_info">Routes: %s</string>
+    <string name="routes_info6">Routes Ipv6: %s</string>
     <string name="ip_not_cidr">Got interface information %1$s and %2$s, assuming second address is peer address of remote. Using /32 netmask for local IP.</string>
     <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string>
     <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string>
@@ -212,5 +213,6 @@
     <string name="import_experimental">Please not that the config importer is an experimental feature.</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>  
+    <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>
+    <string name="import_vpn">Import</string>  
 </resources>
-- 
cgit v1.2.3