Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9bf2ac9 authored by Robin Lee's avatar Robin Lee
Browse files

Update "you're already connected to VPN" strings 

Change-Id: I0e64a612b47655a0d74880bc45987c8cd2272ea8
Fix: 28303500
(cherry picked from commit 3e293cb6)
parent 8f5c6949

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -5180,8 +5180,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] -->
@@ -5199,7 +5199,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] -->

src/com/android/settings/vpn2/AppManagementFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

        }