Rename always on vpn to default vpn

3 files changed, 10 insertions, 5 deletions

diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
index 529ae944..700095d7 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/GeneralSettings.java
@@ -101,10 +101,13 @@ public class GeneralSettings extends PreferenceFragment implements OnPreferenceC
 
 
         VpnProfile vpn = ProfileManager.getAlwaysOnVPN(getActivity());
+		StringBuffer sb = new StringBuffer(getString(R.string.defaultvpnsummary));
+		sb.append('\n');
         if (vpn== null)
-            mAlwaysOnVPN.setSummary(R.string.novpn_selected);
+            sb.append(getString(R.string.novpn_selected));
         else
-            mAlwaysOnVPN.setSummary(vpn.getName());
+           sb.append(getString(R.string.vpnselected, vpn.getName()));
+		mAlwaysOnVPN.setSummary(sb.toString());
 
     }
 
diff --git a/main/src/main/res/values/strings.xml b/main/src/main/res/values/strings.xml
index 197a1310..8ec27578 100755
--- a/main/src/main/res/values/strings.xml
+++ b/main/src/main/res/values/strings.xml
@@ -405,7 +405,9 @@
     <string name="samsung_broken">Even though Samsung phones are among the most selling Android phones, Samsung\'s firmware are also among the most buggy Android firmwares. The bugs are not limited to the VPN operation on these devices but many of them can be workarounded. In the following some of these bugs are described.\n\nDNS does not work unless the DNS server in the VPN range.\n\nOn many Samsung 5.x devices the allowed/disallowed apps feature does not work.\nOn Samsung 6.x VPN is reported not to work unless the VPN app is exempted from Powersave features.</string>
     <string name="samsung_broken_title">Samsung phones</string>
     <string name="novpn_selected">No VPN selected.</string>
-    <string name="alwaysonvpn">VPN used on boot and for Always-On</string>
+    <string name="defaultvpn">Default VPN</string>
+    <string name="defaultvpnsummary">VPN used in places where a default VPN needed. These are currently on boot, for Always-On and the Quick Settings Tile.</string>
+    <string name="vpnselected">Currently slected VPN: \'%s\'</string>
     <string name="reconnect">Reconnect</string>
     <string name="qs_title">Toggle VPN</string>
     <string name="qs_connect">Connect to %s</string>
diff --git a/main/src/main/res/xml/general_settings.xml b/main/src/main/res/xml/general_settings.xml
index bed282b0..f53e6d5b 100644
--- a/main/src/main/res/xml/general_settings.xml
+++ b/main/src/main/res/xml/general_settings.xml
@@ -24,8 +24,8 @@
 
         <ListPreference
             android:key="alwaysOnVpn"
-            android:title="@string/alwaysonvpn"
-            tools:summary="foo bar baz VPN"
+            android:title="@string/defaultvpn"
+            tools:summary="@string/defaultvpnsummary"
             />
 
         <CheckBoxPreference