Merge branch 'dns-content-blockers-not-following-design-ios-319'

mullvad · Sep 22, 2023 · 990b5f8 · 990b5f8
2 parents b0ea3c0 + 0299f3a
commit 990b5f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
@@ -22,7 +22,8 @@ Line wrap the file at 100 chars.                                              Th
 * **Security**: in case of vulnerabilities.
 
 ## [Unreleased]
-
+### Changed
+- The DNS content blockers option do not include the word "block" anymore
 
 ## [2023.4 - 2023-09-12]
 ### Added

diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesCellFactory.swift
@@ -63,7 +63,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_ADS_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block ads",
+                value: "Ads",
                 comment: ""
             )
 
@@ -78,7 +78,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_TRACKERS_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block trackers",
+                value: "Trackers",
                 comment: ""
             )
             configure(
@@ -94,7 +94,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_MALWARE_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block malware",
+                value: "Malware",
                 comment: ""
             )
             configure(
@@ -112,7 +112,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_ADULT_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block adult content",
+                value: "Adult content",
                 comment: ""
             )
             configure(
@@ -126,7 +126,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_GAMBLING_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block gambling",
+                value: "Gambling",
                 comment: ""
             )
             configure(
@@ -140,7 +140,7 @@ final class PreferencesCellFactory: CellFactoryProtocol {
             let localizedString = NSLocalizedString(
                 "BLOCK_SOCIAL_MEDIA_CELL_LABEL",
                 tableName: "Preferences",
-                value: "Block social media",
+                value: "Social media",
                 comment: ""
             )
             configure(