Merge branch 'change-daita-multihop-entry-text-des-1400'

3 files changed, 6 insertions, 6 deletions

diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index c197070d53..6b469ec9c5 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -1353,10 +1353,6 @@ msgctxt "select-location-view"
 msgid "(Added)"
 msgstr ""
 
-msgctxt "select-location-view"
-msgid "%(daita)s overrides %(multihop)s. To use %(multihop)s, please enable “%(directOnly)s” or disable %(daita)s in the %(daita)s settings."
-msgstr ""
-
 #. This is used for appending information about a location.
 #. E.g. "Gothenburg (Entry)" if Gothenburg has been selected as the entrypoint.
 #. Available placeholders:
@@ -1445,6 +1441,10 @@ msgctxt "select-location-view"
 msgid "The app selects a random bridge server, but servers have a higher probability the closer they are to you."
 msgstr ""
 
+msgctxt "select-location-view"
+msgid "The entry server for %(multihop)s is currently overridden by %(daita)s. To select an entry server, please first enable “%(directOnly)s” or disable \"%(daita)s\" in the settings."
+msgstr ""
+
 msgctxt "settings-import"
 msgid "Clear all overrides"
 msgstr ""
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx
index 506c836548..d81a265072 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/select-location/SelectLocation.tsx
@@ -435,7 +435,7 @@ function DisabledEntrySelection() {
         {sprintf(
           messages.pgettext(
             'select-location-view',
-            '%(daita)s overrides %(multihop)s. To use %(multihop)s, please enable “%(directOnly)s” or disable %(daita)s in the %(daita)s settings.',
+            'The entry server for %(multihop)s is currently overridden by %(daita)s. To select an entry server, please first enable “%(directOnly)s” or disable "%(daita)s" in the settings.',
           ),
           { daita: strings.daita, multihop, directOnly },
         )}
diff --git a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location.spec.ts b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location.spec.ts
index 342d511b9e..c723418ec7 100644
--- a/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location.spec.ts
+++ b/desktop/packages/mullvad-vpn/test/e2e/mocked/select-location.spec.ts
@@ -118,7 +118,7 @@ test("App shouldn't show entry selection when daita is enabled without direct on
     response: settings,
   });
 
-  const entryTab = page.getByText('Entry');
+  const entryTab = page.getByText('Entry').first();
   await entryTab.click();
   await expect(entryTab).toHaveCSS('background-color', colors.green);