summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-07-26 13:41:02 +0200
committerBug Magnet <marco.nikic@mullvad.net>2024-07-26 13:41:02 +0200
commitf02965c4903f70f2e1e9d0dfc56203ee7b0accc2 (patch)
treeb1f623d71c7de9ac7b22ff9f1899fcf78403276b
parentf54910e9d57a391ff5fe5dd8b97e6de8c6a3226b (diff)
parent5c41cefe682db2aa822e373d4c90a1fd17917410 (diff)
downloadmullvadvpn-f02965c4903f70f2e1e9d0dfc56203ee7b0accc2.tar.xz
mullvadvpn-f02965c4903f70f2e1e9d0dfc56203ee7b0accc2.zip
Merge branch 'warning-text-needs-to-be-updated-for-dns-content-ios-744'
-rw-r--r--ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift2
-rw-r--r--ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift3
2 files changed, 3 insertions, 2 deletions
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift
index 6de5f04ddd..e1e6b7680f 100644
--- a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift
+++ b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift
@@ -154,7 +154,7 @@ final class CustomDNSCellFactory: CellFactoryProtocol {
cell.titleLabel.text = NSLocalizedString(
"CUSTOM_DNS_CELL_LABEL",
tableName: "VPNSettings",
- value: "Use custom DNS",
+ value: "Use custom DNS server",
comment: ""
)
cell.setEnabled(viewModel.customDNSPrecondition == .satisfied)
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift
index b94420dd67..40fa74e0f6 100644
--- a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift
+++ b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift
@@ -112,8 +112,9 @@ extension CustomDNSViewController: DNSSettingsDataSourceDelegate {
value: """
When this feature is enabled it stops the device from contacting certain \
domains or websites known for distributing ads, malware, trackers and more. \
+
This might cause issues on certain websites, services, and apps.
- Attention: this setting cannot be used in combination with **Use custom DNS**.
+ Attention: this setting cannot be used in combination with **Use custom DNS server**.
""",
comment: ""
), options: MarkdownStylingOptions(font: .preferredFont(forTextStyle: .body)))