diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2023-12-28 15:51:30 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2024-01-05 16:55:43 +0100 |
| commit | 6dd6fa45e2c69921dea5d32bb08179c706247b4f (patch) | |
| tree | 2312879a3f4e75ddf4ab1cfef45610d828cdf191 | |
| parent | 6436f568e6220764bc8ee42587a0dad3201186b7 (diff) | |
| download | mullvadvpn-6dd6fa45e2c69921dea5d32bb08179c706247b4f.tar.xz mullvadvpn-6dd6fa45e2c69921dea5d32bb08179c706247b4f.zip | |
Update DNS content blocker info dialog text
| -rw-r--r-- | gui/locales/messages.pot | 9 | ||||
| -rw-r--r-- | gui/src/renderer/components/VpnSettings.tsx | 14 |
2 files changed, 18 insertions, 5 deletions
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 70a89c22e7..2b24f38a09 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -1416,6 +1416,10 @@ msgid "Attention: enabling this will always require a Mullvad VPN connection in msgstr "" msgctxt "vpn-settings-view" +msgid "Attention: this setting cannot be used in combination with <b>%(customDnsFeatureName)s</b>" +msgstr "" + +msgctxt "vpn-settings-view" msgid "Auto-connect" msgstr "" @@ -1538,7 +1542,7 @@ msgid "This feature allows access to other devices on the local network, such as msgstr "" msgctxt "vpn-settings-view" -msgid "This might cause issues on certain websites, services, and programs." +msgid "This might cause issues on certain websites, services, and apps." msgstr "" #. Label for settings that enables tracker blocking. @@ -1815,9 +1819,6 @@ msgstr "" msgid "This address has already been entered." msgstr "" -msgid "This might cause issues on certain websites, services, and apps." -msgstr "" - msgid "To make sure that you have the most secure version and to inform you of any issues with the current version that is running, the app performs version checks automatically. This sends the app version and Android system version to Mullvad servers. Mullvad keeps counters on number of used app versions and Android versions. The data is never stored or used in any way that can identify you." msgstr "" diff --git a/gui/src/renderer/components/VpnSettings.tsx b/gui/src/renderer/components/VpnSettings.tsx index ab761b9fd0..06f69240b6 100644 --- a/gui/src/renderer/components/VpnSettings.tsx +++ b/gui/src/renderer/components/VpnSettings.tsx @@ -259,6 +259,7 @@ function useDns(setting: keyof IDnsOptions['defaultOptions']) { function DnsBlockers() { const dns = useSelector((state) => state.settings.dns); + const customDnsFeatureName = messages.pgettext('vpn-settings-view', 'Use custom DNS server'); const title = ( <> @@ -275,7 +276,18 @@ function DnsBlockers() { <ModalMessage> {messages.pgettext( 'vpn-settings-view', - 'This might cause issues on certain websites, services, and programs.', + 'This might cause issues on certain websites, services, and apps.', + )} + </ModalMessage> + <ModalMessage> + {formatHtml( + sprintf( + messages.pgettext( + 'vpn-settings-view', + 'Attention: this setting cannot be used in combination with <b>%(customDnsFeatureName)s</b>', + ), + { customDnsFeatureName }, + ), )} </ModalMessage> </InfoButton> |