summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-02-10 13:18:35 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-02-10 13:18:35 +0100
commit067d6289d90aaf4f752222a67fe2c8a703702efc (patch)
tree741d5bf91fdb6b1cff6369a7e69a9ec6837bc659
parent98616b7e7ae6c8722b970895a5756d32872a2b79 (diff)
parentb5c30d95f43924530c5d73e61aadebe1d72488ae (diff)
downloadmullvadvpn-067d6289d90aaf4f752222a67fe2c8a703702efc.tar.xz
mullvadvpn-067d6289d90aaf4f752222a67fe2c8a703702efc.zip
Merge branch 'fix-settings-mismatch-error'
-rw-r--r--gui/locales/messages.pot8
-rw-r--r--gui/src/shared/notifications/error.ts2
2 files changed, 5 insertions, 5 deletions
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index 989233ccd6..c23fe2e6b6 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -699,6 +699,10 @@ msgid "Disconnected and unsecure"
msgstr ""
msgctxt "notifications"
+msgid "No servers in your selected location match your settings."
+msgstr ""
+
+msgctxt "notifications"
msgid "Reconnecting"
msgstr ""
@@ -767,10 +771,6 @@ msgctxt "notifications"
msgid "Your privacy might be at risk with this unsupported app version. Please update now."
msgstr ""
-msgctxt "notifications"
-msgid "Your selected server and tunnel protocol don't match. Please adjust your settings."
-msgstr ""
-
#. Title label in navigation bar
msgctxt "openvpn-settings-nav"
msgid "OpenVPN settings"
diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
index 066c9c333e..d2a43ade8d 100644
--- a/gui/src/shared/notifications/error.ts
+++ b/gui/src/shared/notifications/error.ts
@@ -154,7 +154,7 @@ function getTunnelParameterMessage(err: TunnelParameterError): string {
case 'no_matching_relay':
return messages.pgettext(
'notifications',
- "Your selected server and tunnel protocol don't match. Please adjust your settings.",
+ 'No servers in your selected location match your settings.',
);
case 'no_wireguard_key':
return messages.pgettext(