PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update "you\'re already connected to VPN" strings am: c9bf2ac95e

Browse Source 
am: ac7efa6cf7

* commit 'ac7efa6cf705c334614c2f0974a55bd12fa41e7f':
  Update "you're already connected to VPN" strings

Change-Id: Ifc529e431b535e12971c17532382b3844737fe21
This commit is contained in:
Robin Lee
2016-04-22 14:11:27 +00:00
committed by android-build-merger
parent ba2b684efe ac7efa6cf7
commit d759df2b39
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -5182,8 +5182,8 @@
<string name="vpn_save">Save</string>
<!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
<string name="vpn_connect">Connect</string>
<!-- Button label to continue changing a VPN profile. [CHAR LIMIT=40] -->
<string name="vpn_continue">Continue</string>
<!-- Button label to connect a VPN profile, replacing the current one. [CHAR LIMIT=40] -->
<string name="vpn_replace">Replace</string>
<!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
<string name="vpn_edit">Edit VPN profile</string>
<!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
@@ -5201,7 +5201,7 @@
<!-- Dialog message title to set another VPN app to be always-on [CHAR LIMIT=40] -->
<string name="vpn_replace_always_on_vpn_title">Replace existing VPN?</string>
<!-- Dialog message body to set another VPN app to be always-on [CHAR LIMIT=NONE] -->
<string name="vpn_replace_always_on_vpn_message">You already have a VPN connected to this profile. If you connected to one, your existing VPN will be replaced.</string>
<string name="vpn_replace_always_on_vpn_message">You\'re already connected to a VPN. If you connect to a different one, your existing VPN will be replaced.</string>
<!-- Notification title when the user can't connect an always-on vpn [CHAR LIMIT=NONE] -->
<string name="vpn_cant_connect_notification_title"><xliff:g id="vpn_name" example="OpenVPN">%1$s</xliff:g> can\'t connect</string>
<!-- Notification subtitle when the user can't connect an always-on vpn [CHAR LIMIT=NONE] -->

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -300,7 +300,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
.setTitle(R.string.vpn_replace_always_on_vpn_title)
.setMessage(getActivity().getString(R.string.vpn_replace_always_on_vpn_message))
.setNegativeButton(getActivity().getString(R.string.vpn_cancel), null)
.setPositiveButton(getActivity().getString(R.string.vpn_continue), this)
.setPositiveButton(getActivity().getString(R.string.vpn_replace), this)
.create();
}