Update content blockers informational dialog

- Change programs to apps
- Add custom dns warning
- Add html-formatted text support to info dialog

24 files changed, 24 insertions, 28 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c98cfa6e9..be19251a53 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ Line wrap the file at 100 chars.                                              Th
 
 #### Android
 - Clarify some of the error messages showed in notifications.
+- Change and add text in Content blockers informational dialog.
 
 ### Deprecated
 #### Linux
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
index 652c67e66e..8dde91d091 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/ContentBlockersInfoDialog.kt
@@ -3,12 +3,17 @@ package net.mullvad.mullvadvpn.compose.dialog
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.component.textResource
 
 @Composable
 fun ContentBlockersInfoDialog(onDismiss: () -> Unit) {
     InfoDialog(
-        message = stringResource(id = R.string.dns_content_blockers_info),
-        additionalInfo = stringResource(id = R.string.dns_content_blockers_warning),
+        message =
+            buildString {
+                appendLine(stringResource(id = R.string.dns_content_blockers_info))
+                append(stringResource(id = R.string.dns_content_blockers_warning))
+            },
+        additionalInfo = textResource(id = R.string.dns_content_blockers_custom_dns_warning),
         onDismiss = onDismiss
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
index 1c9870b50f..ddc60ad566 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/InfoDialog.kt
@@ -14,6 +14,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.colorResource
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
@@ -25,6 +26,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.DialogProperties
 import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.component.HtmlText
 import net.mullvad.mullvadvpn.compose.theme.MullvadWhite
 
 @Preview
@@ -70,12 +72,10 @@ fun InfoDialog(message: String, additionalInfo: String? = null, onDismiss: () ->
                     modifier = Modifier.padding(bottom = verticalSpacing).fillMaxWidth()
                 )
                 if (additionalInfo != null) {
-                    Text(
-                        text = additionalInfo,
-                        color = colorResource(id = R.color.white),
-                        fontSize = dimensionResource(id = R.dimen.text_small).value.sp,
-                        fontStyle = FontStyle.Normal,
-                        textAlign = TextAlign.Start,
+                    HtmlText(
+                        htmlFormattedString = additionalInfo,
+                        textColor = colorResource(id = R.color.white).toArgb(),
+                        textSize = dimensionResource(id = R.dimen.text_small).value,
                         modifier = Modifier.fillMaxWidth()
                     )
                 }
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 572d98f09b..b8d1c44e0d 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Når denne funktion er aktiveret, forhindrer den enheden i at kontakte bestemte domæner eller websteder, der er kendt for at distribuere annoncer, malware, trackere og lignende.</string>
     <string name="dns_content_blockers_subtitle">Deaktiver &lt;b&gt;%1$s&lt;/b&gt; nedenfor for at aktivere disse indstillinger.</string>
     <string name="dns_content_blockers_title">DNS-indholdsblokkere</string>
-    <string name="dns_content_blockers_warning">Dette kan forårsage problemer på visse websteder, tjenester og programmer.</string>
     <string name="dont_have_an_account">Har du ikke noget kontonummer?</string>
     <string name="edit_message">Rediger meddelelse</string>
     <string name="enable">Aktiver</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 8f6438776d..3460d26452 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Wenn diese Funktion aktiviert ist, wird das Gerät daran gehindert, bestimmte Domains oder Websites zu kontaktieren, die für die Verbreitung von Werbung, Malware, Trackern und mehr bekannt sind.</string>
     <string name="dns_content_blockers_subtitle">Deaktivieren Sie unten &lt;b&gt;%1$s&lt;/b&gt;, um diese Einstellungen zu aktivieren.</string>
     <string name="dns_content_blockers_title">DNS-Inhaltssperren</string>
-    <string name="dns_content_blockers_warning">Dies kann bei bestimmten Websites, Diensten und Programmen zu Problemen führen.</string>
     <string name="dont_have_an_account">Sie haben keine Kontonummer?</string>
     <string name="edit_message">Nachricht bearbeiten</string>
     <string name="enable">Aktivieren</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 74a942bf27..55d2046f4b 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Al activar esta opción se evita que el dispositivo contacte con determinados dominios o sitios web que se sabe que distribuyen anuncios, malware, rastreadores y más.</string>
     <string name="dns_content_blockers_subtitle">Deshabilite &lt;b&gt;%1$s&lt;/b&gt; abajo para activar estos ajustes.</string>
     <string name="dns_content_blockers_title">Bloqueadores de contenido DNS</string>
-    <string name="dns_content_blockers_warning">Esto podría causar problemas con determinados sitios web, servicios y programas.</string>
     <string name="dont_have_an_account">¿No tiene un número de cuenta?</string>
     <string name="edit_message">Editar mensaje</string>
     <string name="enable">Habilitar</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index f75d307275..7b089ca8cc 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Kun tämä ominaisuus on käytössä, se estää laitetta ottamasta yhteyttä tiettyihin verkkotunnuksiin tai -sivustoihin, jotka tunnetaan mainosten, haittaohjelmien, seurantaohjelmien tai muiden vastaavien jakelijoina.</string>
     <string name="dns_content_blockers_subtitle">Ota nämä asetukset käyttöön poistamalla &lt;b&gt;%1$s&lt;/b&gt; käytöstä alta.</string>
     <string name="dns_content_blockers_title">DNS-sisällönestotoiminnot</string>
-    <string name="dns_content_blockers_warning">Tämä voi aiheuttaa ongelmia tietyillä verkkosivustoilla, palveluissa ja ohjelmissa.</string>
     <string name="dont_have_an_account">Eikö sinulla ole tilinumeroa?</string>
     <string name="edit_message">Muokkaa viestiä</string>
     <string name="enable">Ota käyttöön</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index ec85a3d21e..86d8e05c95 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Lorsque cette fonctionnalité est activée, elle empêche l\'appareil de contacter certains domaines ou sites Web connus pour distribuer des publicités, des logiciels malveillants, des trackers et plus.</string>
     <string name="dns_content_blockers_subtitle">Désactivez &lt;b&gt;%1$s&lt;/b&gt; ci-dessous pour activer ces paramètres.</string>
     <string name="dns_content_blockers_title">Bloqueurs de contenu DNS</string>
-    <string name="dns_content_blockers_warning">Cela peut causer des problèmes sur certains sites Web, services et programmes.</string>
     <string name="dont_have_an_account">Vous n\'avez pas de numéro de compte ?</string>
     <string name="edit_message">Modifier le message</string>
     <string name="enable">Activer</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 6e7576c90e..b119b39b4d 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Quando è abilitata, questa funzionalità impedisce al dispositivo di contattare determinati domini o siti Web noti per la distribuzione di annunci, malware, tracker e altro.</string>
     <string name="dns_content_blockers_subtitle">Disabilita &lt;b&gt;%1$s&lt;/b&gt; di seguito per attivare queste impostazioni.</string>
     <string name="dns_content_blockers_title">Blocchi dei contenuti DNS</string>
-    <string name="dns_content_blockers_warning">Ciò potrebbe causare problemi su determinati siti Web, servizi e programmi.</string>
     <string name="dont_have_an_account">Non hai un numero di account?</string>
     <string name="edit_message">Modifica messaggio</string>
     <string name="enable">Abilita</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 7deb2b311f..deba7f9cf2 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">この機能を有効にすると、広告、マルウェア、トラッカーなどの配信が確認されている特定のドメインまたはWebサイトへのデバイスの接続が阻止されます。</string>
     <string name="dns_content_blockers_subtitle">これらの設定を有効にするには、以下で&lt;b&gt;%1$s&lt;/b&gt;を無効にしてください。</string>
     <string name="dns_content_blockers_title">DNSコンテンツブロッカー</string>
-    <string name="dns_content_blockers_warning">これにより、特定のWebサイト、サービス、プログラムで問題が発生する可能性があります。</string>
     <string name="dont_have_an_account">アカウント番号を持っていませんか？</string>
     <string name="edit_message">メッセージを編集する</string>
     <string name="enable">有効にする</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 8f64d598c6..2b0b5049be 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">이 기능이 활성화되면 광고, 맬웨어, 트래커 등을 배포하는 것으로 알려진 특정 도메인이나 웹사이트에 장치가 연결하지 않게 방지됩니다.</string>
     <string name="dns_content_blockers_subtitle">이 설정을 활성화하려면 아래의 &lt;b&gt;%1$s&lt;/b&gt;을(를) 비활성화하세요.</string>
     <string name="dns_content_blockers_title">DNS 콘텐츠 차단기</string>
-    <string name="dns_content_blockers_warning">이 기능을 사용하면 특정 웹 사이트, 서비스 및 프로그램에서 문제가 발생할 수 있습니다.</string>
     <string name="dont_have_an_account">계정 번호가 없으신가요?</string>
     <string name="edit_message">메시지 편집</string>
     <string name="enable">사용</string>
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index be475fbe07..098e777e0a 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">ဤလုပ်ဆောင်ချက်ကို ဖွင့်ထားသည့်အခါ အနှောင့်အယှက်ဖြစ်စေသည့် ကြော်ငြာများ၊ မဲလ်ဝဲရ်၊ ခြေရာခံများနှင့် အစရှိသည်တို့နှင့်စပ်လျဉ်း၍ သိရှိထားသော အချို့သော Domain များ သို့မဟုတ် ဝဘ်ဆိုက်များနှင့် ဆက်သွယ်ခြင်းမှ စက်ကို ရပ်တန့်ပေးပါသည်။</string>
     <string name="dns_content_blockers_subtitle">ဤဆက်တင်တို့ကို သက်ဝင်လုပ်ဆောင်ရန် အောက်ပါ &lt;b&gt;%1$s&lt;/b&gt; ကို ပိတ်ပါ။</string>
     <string name="dns_content_blockers_title">DNS အကြောင်းအရာ ပိတ်ဆို့မှုများ</string>
-    <string name="dns_content_blockers_warning">၎င်းသည် အချို့သော ဝဘ်ဆိုက်များ၊ ဝန်ဆောင်မှုများနှင့် ပရိုဂရမ်များတွင် ပြဿနာများကို ဖြစ်စေနိုင်သည်။</string>
     <string name="dont_have_an_account">အကောင့်နံပါတ် မရှိ ဖြစ်နေပါသလား။</string>
     <string name="edit_message">မက်ဆေ့ချ် တည်းဖြတ်ရန်</string>
     <string name="enable">ဖွင့်ရန်</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 14afd08ab4..32f3fba7d3 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Når denne funksjonen er aktivert, forhindrer den enheten fra å kontakte bestemte domener og nettsteder som er kjent for å spre annonser, skadelig programvare, sporingsenheter og mer.</string>
     <string name="dns_content_blockers_subtitle">Deaktiver &lt;b&gt;%1$s&lt;/b&gt; under for å aktivere innstillingene.</string>
     <string name="dns_content_blockers_title">DNS-innholdsblokkering</string>
-    <string name="dns_content_blockers_warning">Dette kan føre til problemer på enkelte nettsteder, tjenester og programmer.</string>
     <string name="dont_have_an_account">Har du ikke et kontonummer?</string>
     <string name="edit_message">Rediger melding</string>
     <string name="enable">Aktiver</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 539ab11cd1..f21efd957a 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Als deze functie is ingeschakeld, maakt het apparaat geen contact meer met bepaalde domeinen of websites waarvan bekend is dat ze advertenties, malware, trackers en meer verspreiden.</string>
     <string name="dns_content_blockers_subtitle">Schakel &lt;b&gt;%1$s&lt;/b&gt; hieronder uit om deze instellingen te activeren.</string>
     <string name="dns_content_blockers_title">DNS-contentblokkeringen</string>
-    <string name="dns_content_blockers_warning">Dit kan problemen veroorzaken met bepaalde websites, diensten en programma\'s.</string>
     <string name="dont_have_an_account">Hebt u geen accountnummer?</string>
     <string name="edit_message">Bericht bewerken</string>
     <string name="enable">Inschakelen</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index a24af965a0..954bb2b876 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Po włączeniu funkcja ta uniemożliwia urządzeniu kontakt z określonymi domenami lub witrynami internetowymi, które rozpowszechniają reklamy, złośliwe oprogramowanie itd.</string>
     <string name="dns_content_blockers_subtitle">Aby aktywować te ustawienia, wyłącz &lt;b&gt;%1$s&lt;/b&gt; poniżej.</string>
     <string name="dns_content_blockers_title">Funkcje blokowania treści DNS</string>
-    <string name="dns_content_blockers_warning">Może to powodować problemy z niektórymi witrynami, usługami i programami.</string>
     <string name="dont_have_an_account">Nie masz numeru konta?</string>
     <string name="edit_message">Edytuj wiadomość</string>
     <string name="enable">Włącz</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index f652bb98dd..a635252d2c 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Quando esta funcionalidade é ativada, impede que o dispositivo contacte certos domínios ou sites conhecidos por distribuir anúncios, malware, trackers e muito mais.</string>
     <string name="dns_content_blockers_subtitle">Desative &lt;b&gt;%1$s&lt;/b&gt; abaixo para ativar estas definições.</string>
     <string name="dns_content_blockers_title">Bloqueadores de conteúdo de DNS</string>
-    <string name="dns_content_blockers_warning">Pode causar problemas em alguns sites, serviços e programas.</string>
     <string name="dont_have_an_account">Não tem um número de conta?</string>
     <string name="edit_message">Editar mensagem</string>
     <string name="enable">Ativar</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 3dbadeb46e..b91bc3837e 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">При включенной опции устройство не будет устанавливать соединение с определенными доменами и сайтами, известными распространением рекламы, вредоносного ПО, трекеров и т. д.</string>
     <string name="dns_content_blockers_subtitle">Чтобы активировать эти параметры, отключите опцию &lt;b&gt;%1$s&lt;/b&gt; ниже.</string>
     <string name="dns_content_blockers_title">DNS-блокировщики контента</string>
-    <string name="dns_content_blockers_warning">Это может привести к проблемам при использовании некоторых сайтов, служб и программ.</string>
     <string name="dont_have_an_account">У вас нет номера учетной записи?</string>
     <string name="edit_message">Изменить сообщение</string>
     <string name="enable">Включить</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 880b300b5b..dce52c6bb7 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">När den här funktionen är aktiverad stoppas enheten från att kontakta vissa domäner eller webbplatser som är kända för att sprida annonser, skadlig kod, spårare med mera.</string>
     <string name="dns_content_blockers_subtitle">Inaktivera &lt;b&gt;%1$s&lt;/b&gt; nedan för att aktivera dessa inställningar.</string>
     <string name="dns_content_blockers_title">DNS-innehållsblockerare</string>
-    <string name="dns_content_blockers_warning">Detta kan orsaka problem på vissa webbplatser, tjänster och program.</string>
     <string name="dont_have_an_account">Har du inget kontonummer?</string>
     <string name="edit_message">Redigera meddelande</string>
     <string name="enable">Aktivera</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 217fc04e07..47cc1c384a 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">ในขณะที่เปิดใช้งานคุณสมบัตินี้ คุณสมบัตินี้จะหยุดไม่ให้อุปกรณ์ติดต่อโดเมน หรือเว็บไซต์ใดๆ ที่เป็นที่ทราบกันว่า ใช้ในการเผยแพร่โฆษณา มัลแวร์ ตัวติดตาม และอื่นๆ</string>
     <string name="dns_content_blockers_subtitle">ปิดใช้งาน &lt;b&gt;%1$s&lt;/b&gt; ด้านล่าง เพื่อเปิดใช้การตั้งค่าเหล่านี้</string>
     <string name="dns_content_blockers_title">ตัวบล็อกเนื้อหา DNS</string>
-    <string name="dns_content_blockers_warning">นี่อาจก่อให้เกิดปัญหากับเว็บไซต์ บริการ และโปรแกรมบางอย่างได้</string>
     <string name="dont_have_an_account">ยังไม่มีหมายเลขบัญชีใช่ไหม</string>
     <string name="edit_message">แก้ไขข้อความ</string>
     <string name="enable">เปิดใช้งาน</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 23ec7872fd..7c21db98ca 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">Bu özellik etkinleştirildiğinde, cihazınızın reklamlar, kötü amaçlı yazılımlar, izleyiciler ve daha fazlasını dağıttığı bilinen belirli alan adlarıyla veya web siteleriyle iletişim kurmasını durdurur.</string>
     <string name="dns_content_blockers_subtitle">Bu ayarları etkinleştirmek için aşağıdaki &lt;b&gt;%1$s&lt;/b&gt; seçeneğini devre dışı bırakın.</string>
     <string name="dns_content_blockers_title">DNS içerik engelleyiciler</string>
-    <string name="dns_content_blockers_warning">Bu özellik belirli web sitelerinde, hizmetlerde ve programlarda sorunlara neden olabilir.</string>
     <string name="dont_have_an_account">Hesap numaranız yok mu?</string>
     <string name="edit_message">Mesajı düzenle</string>
     <string name="enable">Etkinleştir</string>
diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml
index 6a4b87da54..84aa623eb0 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">启用此功能后，它将阻止设备与已知的分发广告、恶意软件、跟踪器等内容的特定域或网站联系。</string>
     <string name="dns_content_blockers_subtitle">禁用下方的&lt;b&gt;%1$s&lt;/b&gt;以激活这些设置。</string>
     <string name="dns_content_blockers_title">DNS 内容阻止程序</string>
-    <string name="dns_content_blockers_warning">这可能会导致某些网站、服务和程序出现问题。</string>
     <string name="dont_have_an_account">没有帐号？</string>
     <string name="edit_message">编辑消息</string>
     <string name="enable">启用</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 13164d5c40..f1a7138de2 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -59,7 +59,6 @@
     <string name="dns_content_blockers_info">此功能啟用後，便會禁止裝置聯繫某些已知會傳播廣告、惡意軟體、追蹤程式等內容的網域或網站。</string>
     <string name="dns_content_blockers_subtitle">停用下方的 &lt;b&gt;%1$s&lt;/b&gt; 以啟動這些設定。</string>
     <string name="dns_content_blockers_title">DNS 內容封鎖程式</string>
-    <string name="dns_content_blockers_warning">這可能會導致某些網站、服務和程式出現問題。</string>
     <string name="dont_have_an_account">沒有帳號？</string>
     <string name="edit_message">編輯訊息</string>
     <string name="enable">啟用</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index dc44eac349..6b1bdaac30 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -168,7 +168,10 @@
     <string name="duplicate_address_warning">This address has already been entered.</string>
     <string name="dns_content_blockers_title">DNS content blockers</string>
     <string name="dns_content_blockers_info">When this feature is enabled it stops the device from contacting certain domains or websites known for distributing ads, malware, trackers and more.</string>
-    <string name="dns_content_blockers_warning">This might cause issues on certain websites, services, and programs.</string>
+    <string name="dns_content_blockers_warning">This might cause issues on certain websites, services, and apps.</string>
+    <string name="dns_content_blockers_custom_dns_warning">
+        <![CDATA[Attention: this setting cannot be used in combination with <b>Use custom DNS server</b>.]]>
+    </string>
     <string name="block_ads_title">Ads</string>
     <string name="block_trackers_title">Trackers</string>
     <string name="block_malware_title">Malware</string>
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index 21e0c2c274..14d1a38dc5 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -1641,6 +1641,9 @@ msgstr ""
 msgid "Always-on VPN might be enabled for another app"
 msgstr ""
 
+msgid "Attention: this setting cannot be used in combination with <b>Use custom DNS server</b>."
+msgstr ""
+
 msgid "Blocking internet (device offline)"
 msgstr ""
 
@@ -1716,6 +1719,9 @@ 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.\\n\\nIf the split tunneling feature is used, then the app queries your system for a list of all installed applications. This list is only retrieved in the split tunneling view. The list of installed applications is never sent from the device."
 msgstr ""