Update Split tunneling description

Rawa · Rawa · commit da3199427290 · 2024-04-09T10:20:57.000+02:00
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt
@@ -40,7 +40,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertDoesNotExist()
             onNodeWithText(SHOW_SYSTEM_APPS).assertDoesNotExist()
             onNodeWithText(ALL_APPLICATIONS).assertDoesNotExist()
@@ -76,7 +76,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertExists()
             onNodeWithText(EXCLUDED_APP_NAME).assertExists()
             onNodeWithText(SHOW_SYSTEM_APPS).assertExists()
@@ -108,7 +108,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertDoesNotExist()
             onNodeWithText(EXCLUDED_APP_NAME).assertDoesNotExist()
             onNodeWithText(SHOW_SYSTEM_APPS).assertExists()
@@ -233,7 +233,8 @@ class SplitTunnelingScreenTest {
         private const val INCLUDED_APP_PACKAGE_NAME = "included-pkg"
         private const val INCLUDED_APP_NAME = "Included Name"
         private const val TITLE = "Split tunneling"
-        private const val DESCRIPTION = "Choose the apps you want to exclude from the VPN tunnel."
+        private const val DESCRIPTION =
+            "Lets you select apps that should access the Internet directly without going through the VPN tunnel."
         private const val EXCLUDED_APPLICATIONS = "Excluded applications"
         private const val SHOW_SYSTEM_APPS = "Show system apps"
         private const val ALL_APPLICATIONS = "All applications"
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -126,8 +126,8 @@ fun SplitTunnelingScreen(
             horizontalAlignment = Alignment.CenterHorizontally,
             state = lazyListState
         ) {
+            description()
             enabledToggle(enabled = state.enabled, onEnableSplitTunneling = onEnableSplitTunneling)
-            description(enabled = state.enabled)
             spacer()
             when (state) {
                 is SplitTunnelingUiState.Loading -> {
@@ -161,14 +161,13 @@ private fun LazyListScope.enabledToggle(
     }
 }
 
-private fun LazyListScope.description(enabled: Boolean) {
+private fun LazyListScope.description() {
     item(key = CommonContentKey.DESCRIPTION, contentType = ContentType.DESCRIPTION) {
         SwitchComposeSubtitleCell(
             text =
-                if (enabled) {
-                    stringResource(id = R.string.split_tunneling_description)
-                } else {
-                    stringResource(id = R.string.split_tunneling_disabled_description)
+                buildString {
+                    appendLine(stringResource(id = R.string.split_tunneling_description))
+                    append(stringResource(id = R.string.split_tunneling_description_warning))
                 }
         )
     }
diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-indstillinger</string>
     <string name="show_account_number">Vis kontonummer</string>
     <string name="show_system_apps">Vis systemapps</string>
-    <string name="split_tunneling_description">Vælg de apps, du vil ekskludere fra VPN-tunnelen.</string>
-    <string name="split_tunneling_disabled_description">Split-tunneling er deaktiveret.</string>
     <string name="start_tunnel_error">Kan ikke starte tunnelforbindelse. Indsend en problemrapport.</string>
     <string name="submit_button">Indsend</string>
     <string name="switch_location">Skift placering</string>
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-Einstellungen</string>
     <string name="show_account_number">Kontonummer anzeigen</string>
     <string name="show_system_apps">System-Apps anzeigen</string>
-    <string name="split_tunneling_description">Wählen Sie die Apps aus, die Sie aus dem VPN-Tunnel ausschließen möchten.</string>
-    <string name="split_tunneling_disabled_description">Split-Tunneling ist deaktiviert.</string>
     <string name="start_tunnel_error">Die Tunnelverbindung konnte nicht gestartet werden. Bitte senden Sie einen Problembericht.</string>
     <string name="submit_button">Absenden</string>
     <string name="switch_location">Ort wechseln</string>
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Configuración de VPN</string>
     <string name="show_account_number">Mostrar número de cuenta</string>
     <string name="show_system_apps">Mostrar aplicaciones del sistema</string>
-    <string name="split_tunneling_description">Seleccione las aplicaciones que quiera excluir del túnel VPN.</string>
-    <string name="split_tunneling_disabled_description">La tunelización dividida está deshabilitada.</string>
     <string name="start_tunnel_error">No se puede iniciar la conexión del túnel. Envíe un informe de problemas.</string>
     <string name="submit_button">Enviar</string>
     <string name="switch_location">Cambiar ubicación</string>
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-asetukset</string>
     <string name="show_account_number">Näytä tilin numero</string>
     <string name="show_system_apps">Näytä järjestelmäsovellukset</string>
-    <string name="split_tunneling_description">Valitse sovellukset, jotka haluat sulkea pois VPN-tunnelista.</string>
-    <string name="split_tunneling_disabled_description">Sovelluskohtainen yhdistäminen on poistettu käytöstä.</string>
     <string name="start_tunnel_error">Tunneliyhteyden muodostaminen ei onnistu. Lähetä ongelmaraportti.</string>
     <string name="submit_button">Lähetä</string>
     <string name="switch_location">Vaihda sijaintia</string>
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Paramètres VPN</string>
     <string name="show_account_number">Afficher le numéro de compte</string>
     <string name="show_system_apps">Afficher les applications système</string>
-    <string name="split_tunneling_description">Choisissez les applications que vous souhaitez exclure du tunnel VPN.</string>
-    <string name="split_tunneling_disabled_description">Le split tunneling est désactivé.</string>
     <string name="start_tunnel_error">Impossible de démarrer la connexion au tunnel. Veuillez envoyer un rapport de problème.</string>
     <string name="submit_button">Envoyer</string>
     <string name="switch_location">Changer de localisation</string>
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Impostazioni VPN</string>
     <string name="show_account_number">Mostra numero di account</string>
     <string name="show_system_apps">Mostra app di sistema</string>
-    <string name="split_tunneling_description">Scegli le app che desideri escludere dal tunnel VPN.</string>
-    <string name="split_tunneling_disabled_description">Lo split tunneling è disabilitato.</string>
     <string name="start_tunnel_error">Impossibile avviare la connessione tunnel. Invia una segnalazione del problema.</string>
     <string name="submit_button">Invia</string>
     <string name="switch_location">Cambia posizione</string>
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN設定</string>
     <string name="show_account_number">アカウント番号の表示</string>
     <string name="show_system_apps">システムアプリの表示</string>
-    <string name="split_tunneling_description">VPNトンネルから除外するアプリを選択してください。</string>
-    <string name="split_tunneling_disabled_description">スプリットトンネリングは無効です。</string>
     <string name="start_tunnel_error">トンネル接続を開始できません。問題の報告を送信してください。</string>
     <string name="submit_button">送信</string>
     <string name="switch_location">場所を切り替える</string>
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN 설정</string>
     <string name="show_account_number">계정 번호 표시</string>
     <string name="show_system_apps">시스템 앱 표시</string>
-    <string name="split_tunneling_description">VPN 터널에서 제외할 앱을 선택하세요.</string>
-    <string name="split_tunneling_disabled_description">분할 터널링이 비활성화되었습니다.</string>
     <string name="start_tunnel_error">터널 연결을 시작할 수 없습니다. 문제 보고서를 보내주세요.</string>
     <string name="submit_button">제출</string>
     <string name="switch_location">위치 전환</string>
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN ဆက်တင်များ</string>
     <string name="show_account_number">အကောင့်နံပါတ်ကို ပြရန်</string>
     <string name="show_system_apps">စနစ်အက်ပ်များ ပြရန်</string>
-    <string name="split_tunneling_description">VPN Tunnel မှ ဖယ်ထုတ်လိုသည့် အက်ပ်များကို ရွေးချယ်ပါ။</string>
-    <string name="split_tunneling_disabled_description">Split Tunneling ကို ပိတ်ထားပါသည်။</string>
     <string name="start_tunnel_error">Tunnel ချိတ်ဆက်မှုကို စတင်၍ မရနိုင်ပါ။ ပြဿနာ ရီပို့တ်တစ်ခု ပေးပို့ပေးပါ။</string>
     <string name="submit_button">ပေးပို့ရန်</string>
     <string name="switch_location">တည်နေရာ ပြောင်းရန်</string>
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-innstillinger</string>
     <string name="show_account_number">Vis kontonummer</string>
     <string name="show_system_apps">Vis systemapper</string>
-    <string name="split_tunneling_description">Velg appene du vil ekskludere fra VPN-tunnelen.</string>
-    <string name="split_tunneling_disabled_description">Delt tunnelering er deaktivert.</string>
     <string name="start_tunnel_error">Kunne ikke starte tunneltilkobling. Send inn en problemrapport.</string>
     <string name="submit_button">Send inn</string>
     <string name="switch_location">Bytt plassering</string>
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-instellingen</string>
     <string name="show_account_number">Accountnummer weergeven</string>
     <string name="show_system_apps">Systeemapps weergeven</string>
-    <string name="split_tunneling_description">Kies de apps die die u wilt uitsluiten van de VPN-tunnel.</string>
-    <string name="split_tunneling_disabled_description">Gesplitste tunneling is uitgeschakeld.</string>
     <string name="start_tunnel_error">Kan de tunnelverbinding niet starten. Stuur een probleemrapport.</string>
     <string name="submit_button">Verzenden</string>
     <string name="switch_location">Locatie wijzigen</string>
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Ustawienia VPN</string>
     <string name="show_account_number">Pokaż numer konta</string>
     <string name="show_system_apps">Pokaż aplikacje systemowe</string>
-    <string name="split_tunneling_description">Wybierz aplikacje, które chcesz wykluczyć z tunelu VPN.</string>
-    <string name="split_tunneling_disabled_description">Dzielone tunelowanie jest wyłączone.</string>
     <string name="start_tunnel_error">Nie można uruchomić połączenia tunelowego. Wyślij zgłoszenie problemu.</string>
     <string name="submit_button">Prześlij</string>
     <string name="switch_location">Zmień lokalizację</string>
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Definições de VPN</string>
     <string name="show_account_number">Mostrar número de conta</string>
     <string name="show_system_apps">Mostrar aplicações do sistema</string>
-    <string name="split_tunneling_description">Escolha as aplicações que deseja excluir do túnel VPN.</string>
-    <string name="split_tunneling_disabled_description">A divisão do túnel está desativada.</string>
     <string name="start_tunnel_error">Não foi possível iniciar a ligação de túnel. Envie um relatório do problema.</string>
     <string name="submit_button">Enviar</string>
     <string name="switch_location">Alterar local</string>
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">Настройки VPN</string>
     <string name="show_account_number">Показать номер учетной записи</string>
     <string name="show_system_apps">Показывать системные приложения</string>
-    <string name="split_tunneling_description">Выберите приложения, которые нужно исключить из туннеля VPN.</string>
-    <string name="split_tunneling_disabled_description">Раздельное туннелирование отключено.</string>
     <string name="start_tunnel_error">Не удалось запустить туннельное подключение. Отправьте сообщение о проблеме.</string>
     <string name="submit_button">Отправить</string>
     <string name="switch_location">Сменить местоположение</string>
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN-inställningar</string>
     <string name="show_account_number">Visa kontonummer</string>
     <string name="show_system_apps">Visa systemappar</string>
-    <string name="split_tunneling_description">Välj de appar du vill exkludera från VPN-tunneln.</string>
-    <string name="split_tunneling_disabled_description">Delade tunnlar är inaktiverat.</string>
     <string name="start_tunnel_error">Det går inte att starta tunnelanslutning. Skicka en problemrapport.</string>
     <string name="submit_button">Skicka</string>
     <string name="switch_location">Växla plats</string>
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">การตั้งค่า VPN</string>
     <string name="show_account_number">แสดงหมายเลขบัญชี</string>
     <string name="show_system_apps">แสดงแอประบบ</string>
-    <string name="split_tunneling_description">เลือกแอปที่คุณต้องการแยกออกจากช่องทาง VPN</string>
-    <string name="split_tunneling_disabled_description">ปิดใช้งานการแยกอุโมงค์อยู่</string>
     <string name="start_tunnel_error">ไม่สามารถเริ่มการเชื่อมต่ออุโมงค์ได้ โปรดส่งรายงานปัญหา</string>
     <string name="submit_button">ส่ง</string>
     <string name="switch_location">สลับตำแหน่ง</string>
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN ayarları</string>
     <string name="show_account_number">Hesap numarasını göster</string>
     <string name="show_system_apps">Sistem uygulamalarını göster</string>
-    <string name="split_tunneling_description">VPN tünelinden hariç tutmak istediğiniz uygulamaları seçin.</string>
-    <string name="split_tunneling_disabled_description">Bölünmüş tünelleme devre dışı.</string>
     <string name="start_tunnel_error">Tünel bağlantısı başlatılamıyor. Lütfen bir hata raporu gönderin.</string>
     <string name="submit_button">Gönder</string>
     <string name="switch_location">Konum değiştir</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN 设置</string>
     <string name="show_account_number">显示帐号</string>
     <string name="show_system_apps">显示系统应用</string>
-    <string name="split_tunneling_description">选择您想要从 VPN 隧道中排除的应用。</string>
-    <string name="split_tunneling_disabled_description">拆分隧道被禁用。</string>
     <string name="start_tunnel_error">无法启动隧道连接。请发送问题报告。</string>
     <string name="submit_button">提交</string>
     <string name="switch_location">切换位置</string>
diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
@@ -228,8 +228,6 @@
     <string name="settings_vpn">VPN 設定</string>
     <string name="show_account_number">顯示帳號</string>
     <string name="show_system_apps">顯示系統應用程式</string>
-    <string name="split_tunneling_description">選擇要從 VPN 通道中排除的應用程式。</string>
-    <string name="split_tunneling_disabled_description">分割通道已停用。</string>
     <string name="start_tunnel_error">無法啟動通道連線。請傳送問題回報。</string>
     <string name="submit_button">提交</string>
     <string name="switch_location">切換位置</string>
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
@@ -154,7 +154,8 @@
     <string name="select_location">Select location</string>
     <string name="filter">Filter</string>
     <string name="select_location_description">While connected, your real location is masked with a private and secure location in the selected region.</string>
-    <string name="split_tunneling_description">Choose the apps you want to exclude from the VPN tunnel.</string>
+    <string name="split_tunneling_description">Lets you select apps that should access the Internet directly without going through the VPN tunnel.</string>
+    <string name="split_tunneling_description_warning">Attention: Split tunneling is a privacy risk.</string>
     <string name="enable">Enable</string>
     <string name="enable_custom_dns">Use custom DNS server</string>
     <string name="add_a_server">Add a server</string>
@@ -279,7 +280,6 @@
     <string name="loading_connecting">Connecting...</string>
     <string name="loading_verifying">Verifying purchase...</string>
     <string name="copied_logs_to_clipboard">Copied logs to clipboard</string>
-    <string name="split_tunneling_disabled_description">Split tunneling is disabled.</string>
     <string name="auto_connect_legacy">Auto-connect (legacy)</string>
     <string name="auto_connect_footer_legacy"><![CDATA[Please use the <b>Always-on</b> system setting instead by following the guide in <b>%s</b> above.]]></string>
     <string name="custom_lists">Custom lists</string>
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
@@ -2067,6 +2067,9 @@ msgstr ""
 msgid "Always-on VPN might be enabled for another app"
 msgstr ""
 
+msgid "Attention: Split tunneling is a privacy risk."
+msgstr ""
+
 msgid "Attention: this setting cannot be used in combination with <b>Use custom DNS server</b>."
 msgstr ""
 
@@ -2187,6 +2190,9 @@ msgstr ""
 msgid "Invalid or missing value \"%s\""
 msgstr ""
 
+msgid "Lets you select apps that should access the Internet directly without going through the VPN tunnel."
+msgstr ""
+
 msgid "List name"
 msgstr ""
 
@@ -2295,9 +2301,6 @@ msgstr ""
 msgid "Shows reminders when the account time is about to expire"
 msgstr ""
 
-msgid "Split tunneling is disabled."
-msgstr ""
-
 msgid "Submit"
 msgstr ""
 

Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,8 @@ fun SplitTunnelingScreen(`
`126`	`126`	`horizontalAlignment = Alignment.CenterHorizontally,`
`127`	`127`	`state = lazyListState`
`128`	`128`	`) {`
	`129`	`+ description()`
`129`	`130`	`enabledToggle(enabled = state.enabled, onEnableSplitTunneling = onEnableSplitTunneling)`
`130`		`- description(enabled = state.enabled)`
`131`	`131`	`spacer()`
`132`	`132`	`when (state) {`
`133`	`133`	`is SplitTunnelingUiState.Loading -> {`
`@@ -161,14 +161,13 @@ private fun LazyListScope.enabledToggle(`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`
`164`		`-private fun LazyListScope.description(enabled: Boolean) {`
	`164`	`+private fun LazyListScope.description() {`
`165`	`165`	`item(key = CommonContentKey.DESCRIPTION, contentType = ContentType.DESCRIPTION) {`
`166`	`166`	`SwitchComposeSubtitleCell(`
`167`	`167`	`text =`
`168`		`- if (enabled) {`
`169`		`- stringResource(id = R.string.split_tunneling_description)`
`170`		`- } else {`
`171`		`- stringResource(id = R.string.split_tunneling_disabled_description)`
	`168`	`+ buildString {`
	`169`	`+ appendLine(stringResource(id = R.string.split_tunneling_description))`
	`170`	`+ append(stringResource(id = R.string.split_tunneling_description_warning))`
`172`	`171`	`}`
`173`	`172`	`)`
`174`	`173`	`}`