Clarify blocking network message

22 files changed, 3 insertions, 24 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
index f84a6b0553..01d8cfdacf 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt
@@ -44,7 +44,7 @@ class TunnelStateNotification(
     }
 
     private fun showGenericBlockingMessage() {
-        title = context.getString(R.string.blocking_all_connections)
+        title = context.getString(R.string.blocking_internet)
         message = null
         shouldShow = true
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ErrorStateExtension.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ErrorStateExtension.kt
index ec4091b55d..9c25a194af 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ErrorStateExtension.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ErrorStateExtension.kt
@@ -11,7 +11,7 @@ fun ErrorState.getErrorNotificationResources(context: Context): ErrorNotificatio
     return when {
         cause is ErrorStateCause.InvalidDnsServers -> {
             ErrorNotificationMessage(
-                R.string.blocking_all_connections,
+                R.string.blocking_internet,
                 cause.errorMessageId(),
                 cause.addresses.joinToString { address -> address.addressString() }
             )
@@ -19,8 +19,7 @@ fun ErrorState.getErrorNotificationResources(context: Context): ErrorNotificatio
         cause is ErrorStateCause.VpnPermissionDenied -> {
             resolveAlwaysOnVpnErrorNotificationMessage(context.getAlwaysOnVpnAppName())
         }
-        isBlocking ->
-            ErrorNotificationMessage(R.string.blocking_all_connections, cause.errorMessageId())
+        isBlocking -> ErrorNotificationMessage(R.string.blocking_internet, cause.errorMessageId())
         else -> ErrorNotificationMessage(R.string.critical_error, R.string.failed_to_block_internet)
     }
 }
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 64683a5c26..f0a7ce1809 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Trackere</string>
     <string name="blocked_connection">FORBINDELSE BLOKERET</string>
-    <string name="blocking_all_connections">Blokerer alle forbindelser</string>
     <string name="blocking_internet">Blokerer internettet</string>
     <string name="buy_credit">Køb kredit</string>
     <string name="buy_more_credit">Køb mere kredit</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 903121b42e..279a4e6b36 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Tracker</string>
     <string name="blocked_connection">GESPERRTE VERBINDUNG</string>
-    <string name="blocking_all_connections">Alle Verbindungen werden blockiert</string>
     <string name="blocking_internet">Internet wird gesperrt</string>
     <string name="buy_credit">Guthaben erwerben</string>
     <string name="buy_more_credit">Mehr Guthaben erwerben</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 7e5989dea0..4e0a5b904d 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Rastreadores</string>
     <string name="blocked_connection">CONEXIÓN BLOQUEADA</string>
-    <string name="blocking_all_connections">Bloqueando todas las conexiones</string>
     <string name="blocking_internet">Internet bloqueado</string>
     <string name="buy_credit">Comprar créditos</string>
     <string name="buy_more_credit">Comprar más créditos</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index dea15889a8..839453db83 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Haittaohjelmat</string>
     <string name="block_trackers_title">Seurantapalvelimet</string>
     <string name="blocked_connection">ESTETTY YHTEYS</string>
-    <string name="blocking_all_connections">Kaikki yhteydet estetään</string>
     <string name="blocking_internet">Verkkoyhteys estetään</string>
     <string name="buy_credit">Osta käyttöaikaa</string>
     <string name="buy_more_credit">Uudista tilaus</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 3e30a8dfff..f35b77564b 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Trackers</string>
     <string name="blocked_connection">CONNEXION BLOQUÉE</string>
-    <string name="blocking_all_connections">Blocage de toutes les connexions</string>
     <string name="blocking_internet">Internet bloqué</string>
     <string name="buy_credit">Acheter des crédits</string>
     <string name="buy_more_credit">Acheter plus de crédits</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 342383f67b..fffa441580 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Tracker</string>
     <string name="blocked_connection">CONNESSIONE BLOCCATA</string>
-    <string name="blocking_all_connections">Blocco di tutte le connessioni</string>
     <string name="blocking_internet">Blocco di Internet</string>
     <string name="buy_credit">Acquista credito</string>
     <string name="buy_more_credit">Acquista altro credito</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 888fbac831..31e0e755c2 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">マルウェア</string>
     <string name="block_trackers_title">トラッカー</string>
     <string name="blocked_connection">ブロックされた接続</string>
-    <string name="blocking_all_connections">すべての接続をブロックしています</string>
     <string name="blocking_internet">インターネットをブロック中</string>
     <string name="buy_credit">クレジットを購入</string>
     <string name="buy_more_credit">追加クレジットを購入</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 8a5d117322..43e555d9e7 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">맬웨어</string>
     <string name="block_trackers_title">트래커</string>
     <string name="blocked_connection">연결 차단됨</string>
-    <string name="blocking_all_connections">모든 연결 차단 중</string>
     <string name="blocking_internet">인터넷 차단</string>
     <string name="buy_credit">크레딧 구매</string>
     <string name="buy_more_credit">추가 크레딧 구매</string>
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index 78ed4902ae..34cc07e7ea 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">မဲလ်ဝဲရ်</string>
     <string name="block_trackers_title">ခြေရာခံများ</string>
     <string name="blocked_connection">ပိတ်ဆို့ထားသည့် ချိတ်ဆက်မှု</string>
-    <string name="blocking_all_connections">ချိတ်ဆက်မှု အားလုံးကို ပိတ်ဆို့ထားပါသည်</string>
     <string name="blocking_internet">အင်တာနက် ပိတ်ဆို့နေပါသည်</string>
     <string name="buy_credit">ခရက်ဒစ် ဝယ်ရန်</string>
     <string name="buy_more_credit">ခရက်ဒစ်များ ဝယ်ရန်</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 554421b685..2c198c8706 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Skadelig programvare</string>
     <string name="block_trackers_title">Sporing</string>
     <string name="blocked_connection">TILKOBLING BLOKKERT</string>
-    <string name="blocking_all_connections">Blokkerer alle tilkoblinger</string>
     <string name="blocking_internet">Blokkerer internettet</string>
     <string name="buy_credit">Kjøp kreditt</string>
     <string name="buy_more_credit">Kjøp mer kreditt</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 39d29ed5d9..e3e21c656b 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Trackers</string>
     <string name="blocked_connection">VERBINDING GEBLOKKEERD</string>
-    <string name="blocking_all_connections">Alle verbindingen worden geblokkeerd</string>
     <string name="blocking_internet">Internet blokkeren</string>
     <string name="buy_credit">Krediet kopen</string>
     <string name="buy_more_credit">Meer krediet kopen</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 07b4ce6525..e3f7cc3f5d 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Złośliwe oprogramowanie</string>
     <string name="block_trackers_title">Trackery</string>
     <string name="blocked_connection">ZABLOKOWANE POŁĄCZENIE</string>
-    <string name="blocking_all_connections">Blokowanie wszystkich połączeń</string>
     <string name="blocking_internet">Blokowanie Internetu</string>
     <string name="buy_credit">Kup doładowanie</string>
     <string name="buy_more_credit">Doładuj konto</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 59a310f3b2..3a465f38c9 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Malware</string>
     <string name="block_trackers_title">Trackers</string>
     <string name="blocked_connection">LIGAÇÃO BLOQUEADA</string>
-    <string name="blocking_all_connections">A bloquear todas as ligações</string>
     <string name="blocking_internet">A bloquear a Internet</string>
     <string name="buy_credit">Comprar crédito</string>
     <string name="buy_more_credit">Comprar mais crédito</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 4e6c803faf..794806eb96 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Вредоносное ПО</string>
     <string name="block_trackers_title">Трекеры</string>
     <string name="blocked_connection">ПОДКЛЮЧЕНИЕ ЗАБЛОКИРОВАНО</string>
-    <string name="blocking_all_connections">Блокируются все подключения</string>
     <string name="blocking_internet">Блокируется доступ в Интернет</string>
     <string name="buy_credit">Пополнить баланс</string>
     <string name="buy_more_credit">Пополнить баланс</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index c14d953e1b..03a16e4a0f 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Skadlig kod</string>
     <string name="block_trackers_title">Spårare</string>
     <string name="blocked_connection">ANSLUTNINGEN BLOCKERAD</string>
-    <string name="blocking_all_connections">Blockerar alla anslutningar</string>
     <string name="blocking_internet">Blockerar internet</string>
     <string name="buy_credit">Köp kredit</string>
     <string name="buy_more_credit">Köp mer kredit</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 926f7a35d1..2c0a4b9146 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">มัลแวร์</string>
     <string name="block_trackers_title">ตัวติดตาม</string>
     <string name="blocked_connection">การเชื่อมต่อที่ถูกบล็อก</string>
-    <string name="blocking_all_connections">บล็อกการเชื่อมต่อทั้งหมด</string>
     <string name="blocking_internet">กำลังบล็อกอินเทอร์เน็ต</string>
     <string name="buy_credit">ซื้อเครดิต</string>
     <string name="buy_more_credit">ซื้อเครดิตเพิ่ม</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index c216691300..f2eefd3913 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">Kötü amaçlı yazılım</string>
     <string name="block_trackers_title">İzleyiciler</string>
     <string name="blocked_connection">ENGELLENEN BAĞLANTI</string>
-    <string name="blocking_all_connections">Tüm bağlantılar engelleniyor</string>
     <string name="blocking_internet">İnternet bağlantısı engelleniyor</string>
     <string name="buy_credit">Kredi satın alın</string>
     <string name="buy_more_credit">Daha fazla kredi satın alın</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 62cba3caff..38852dfc08 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">恶意软件</string>
     <string name="block_trackers_title">跟踪器</string>
     <string name="blocked_connection">已阻止连接</string>
-    <string name="blocking_all_connections">正在阻止所有连接</string>
     <string name="blocking_internet">正在阻止网络</string>
     <string name="buy_credit">购买额度</string>
     <string name="buy_more_credit">购买更多额度</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 c086b24941..3cb6f84dfb 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -24,7 +24,6 @@
     <string name="block_malware_title">惡意軟體</string>
     <string name="block_trackers_title">追蹤程式</string>
     <string name="blocked_connection">被封鎖的連線</string>
-    <string name="blocking_all_connections">正在封鎖所有連線</string>
     <string name="blocking_internet">正在封鎖網路</string>
     <string name="buy_credit">購買點數</string>
     <string name="buy_more_credit">購買更多點數</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 9745a7358e..b63ad7ba68 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -5,7 +5,6 @@
     <string name="secured">Secured</string>
     <string name="unsecured">Unsecured</string>
     <string name="critical_error">Critical error (your attention is required)</string>
-    <string name="blocking_all_connections">Blocking all connections</string>
     <string name="foreground_notification_channel_name">VPN tunnel status</string>
     <string name="foreground_notification_channel_description">Shows current VPN tunnel
     status</string>