From e481245959d63c9aa23c562cae6dbc5aea5eb307 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 10 Apr 2013 10:58:43 +0200
Subject: Always log tun information

I tired of bug reports without this information. Also this removes one of the unclear buttons in the Logwindow
---
 res/menu/logmenu.xml   | 8 +-------
 res/values/strings.xml | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'res')

diff --git a/res/menu/logmenu.xml b/res/menu/logmenu.xml
index 12b54c67..4c4f132b 100644
--- a/res/menu/logmenu.xml
+++ b/res/menu/logmenu.xml
@@ -11,14 +11,8 @@
         android:id="@+id/cancel"
         android:icon="@android:drawable/ic_menu_close_clear_cancel"
         android:showAsAction="ifRoom|withText"
-        android:title="@string/disconnect"
+        android:title="@string/cancel_connection"
         android:titleCondensed="@string/cancel"/>
-    <item
-        android:id="@+id/info"
-        android:icon="@android:drawable/ic_menu_info_details"
-        android:showAsAction="ifRoom|withText"
-        android:title="@string/show_connection_details"
-        android:titleCondensed="@string/info"/>
     <item
         android:id="@+id/send"
         android:icon="@android:drawable/ic_menu_share"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index abdf1779..876e981c 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,8 +20,6 @@
     <string name="copyright_guicode">Source code and issue tracker available at http://code.google.com/p/ics-openvpn/</string>
     <string name="copyright_others">This program uses the following components; see the source code for full details on the licenses</string>
     <string name="about">About</string>
-    <string name="about_summary">About OpenVPN for Android</string>
-    <string name="vpn_list_summary">List of all configured VPNs</string>
     <string name="vpn_list_title">Profiles</string>
     <string name="vpn_type">Type</string>
     <string name="pkcs12pwquery">PKCS12 Password</string>
@@ -57,7 +55,6 @@
     <string name="custom_config_summary">Specify custom options. Use with care!</string>
     <string name="route_rejected">Route rejected by Android</string>
     <string name="cancel_connection">Disconnect</string>
-    <string name="disconnect">Disconnect</string>
     <string name="clear_log">clear log</string>
     <string name="title_cancel">Cancel Confirmation</string>
     <string name="cancel_connection_query">Disconnect the connected VPN/cancel the connection attempt?</string>
@@ -99,10 +96,9 @@
     <string name="clear">Clear</string>
     <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="last_openvpn_tun_config">Opening tun interface:</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="dns_server_info">DNS Server: %1$s, Domain: %2$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. Mode given by OpenVPN is \"%3$s\".</string>
-- 
cgit v1.2.3