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
index ba5032129c5f..e2e805c466d8 100644
--- 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
@@ -41,6 +41,7 @@ import net.mullvad.mullvadvpn.compose.extensions.itemWithDivider
import net.mullvad.mullvadvpn.compose.extensions.itemsIndexedWithDivider
import net.mullvad.mullvadvpn.compose.state.SplitTunnelingUiState
import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
+import net.mullvad.mullvadvpn.constant.NEWLINE_STRING
import net.mullvad.mullvadvpn.lib.theme.AppTheme
import net.mullvad.mullvadvpn.lib.theme.Dimens
import net.mullvad.mullvadvpn.lib.theme.color.AlphaDisabled
@@ -126,8 +127,8 @@ fun SplitTunnelingScreen(
horizontalAlignment = Alignment.CenterHorizontally,
state = lazyListState
) {
- enabledToggle(enabled = state.enabled, onEnableSplitTunneling = onEnableSplitTunneling)
description()
+ enabledToggle(enabled = state.enabled, onEnableSplitTunneling = onEnableSplitTunneling)
spacer()
when (state) {
is SplitTunnelingUiState.Loading -> {
@@ -163,7 +164,13 @@ private fun LazyListScope.enabledToggle(
private fun LazyListScope.description() {
item(key = CommonContentKey.DESCRIPTION, contentType = ContentType.DESCRIPTION) {
- SwitchComposeSubtitleCell(text = stringResource(id = R.string.split_tunneling_description))
+ SwitchComposeSubtitleCell(
+ text = buildString {
+ append(stringResource(id = R.string.split_tunneling_description))
+ append(NEWLINE_STRING)
+ 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
index 1e2296f0303b..b154eb73f36d 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -228,7 +228,6 @@
VPN-indstillinger
Vis kontonummer
Vis systemapps
- Vælg de apps, du vil ekskludere fra VPN-tunnelen.
Kan ikke starte tunnelforbindelse. Indsend en problemrapport.
Indsend
Skift placering
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
index d70ab432095a..a25057c2e093 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -228,7 +228,6 @@
VPN-Einstellungen
Kontonummer anzeigen
System-Apps anzeigen
- Wählen Sie die Apps aus, die Sie aus dem VPN-Tunnel ausschließen möchten.
Die Tunnelverbindung konnte nicht gestartet werden. Bitte senden Sie einen Problembericht.
Absenden
Ort wechseln
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
index aba35e34c87e..76b00aa4f6bd 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -228,7 +228,6 @@
Configuración de VPN
Mostrar número de cuenta
Mostrar aplicaciones del sistema
- Seleccione las aplicaciones que quiera excluir del túnel VPN.
No se puede iniciar la conexión del túnel. Envíe un informe de problemas.
Enviar
Cambiar ubicación
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
index 2ca8320a4896..469e37c2ac79 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -228,7 +228,6 @@
VPN-asetukset
Näytä tilin numero
Näytä järjestelmäsovellukset
- Valitse sovellukset, jotka haluat sulkea pois VPN-tunnelista.
Tunneliyhteyden muodostaminen ei onnistu. Lähetä ongelmaraportti.
Lähetä
Vaihda sijaintia
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
index 308f09a63529..c3a015dadfe0 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -228,7 +228,6 @@
Paramètres VPN
Afficher le numéro de compte
Afficher les applications système
- Choisissez les applications que vous souhaitez exclure du tunnel VPN.
Impossible de démarrer la connexion au tunnel. Veuillez envoyer un rapport de problème.
Envoyer
Changer de localisation
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
index d32f9111f89e..5cfe7da92ee6 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -228,7 +228,6 @@
Impostazioni VPN
Mostra numero di account
Mostra app di sistema
- Scegli le app che desideri escludere dal tunnel VPN.
Impossibile avviare la connessione tunnel. Invia una segnalazione del problema.
Invia
Cambia posizione
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
index 7e5c24583ff5..773a2de378d7 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -228,7 +228,6 @@
VPN設定
アカウント番号の表示
システムアプリの表示
- VPNトンネルから除外するアプリを選択してください。
トンネル接続を開始できません。問題の報告を送信してください。
送信
場所を切り替える
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
index 652fd6f513e7..b4ea3edaa6c0 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -228,7 +228,6 @@
VPN 설정
계정 번호 표시
시스템 앱 표시
- VPN 터널에서 제외할 앱을 선택하세요.
터널 연결을 시작할 수 없습니다. 문제 보고서를 보내주세요.
제출
위치 전환
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
index d80eefe1d1fd..f5397f987746 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -228,7 +228,6 @@
VPN ဆက်တင်များ
အကောင့်နံပါတ်ကို ပြရန်
စနစ်အက်ပ်များ ပြရန်
- VPN Tunnel မှ ဖယ်ထုတ်လိုသည့် အက်ပ်များကို ရွေးချယ်ပါ။
Tunnel ချိတ်ဆက်မှုကို စတင်၍ မရနိုင်ပါ။ ပြဿနာ ရီပို့တ်တစ်ခု ပေးပို့ပေးပါ။
ပေးပို့ရန်
တည်နေရာ ပြောင်းရန်
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
index a7e5660d90b8..334d6fd025e0 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -228,7 +228,6 @@
VPN-innstillinger
Vis kontonummer
Vis systemapper
- Velg appene du vil ekskludere fra VPN-tunnelen.
Kunne ikke starte tunneltilkobling. Send inn en problemrapport.
Send inn
Bytt plassering
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
index 729bbe2dbb21..5c7beb43393f 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -228,7 +228,6 @@
VPN-instellingen
Accountnummer weergeven
Systeemapps weergeven
- Kies de apps die die u wilt uitsluiten van de VPN-tunnel.
Kan de tunnelverbinding niet starten. Stuur een probleemrapport.
Verzenden
Locatie wijzigen
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
index 0cf8a474a553..1bce8833fc4b 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -228,7 +228,6 @@
Ustawienia VPN
Pokaż numer konta
Pokaż aplikacje systemowe
- Wybierz aplikacje, które chcesz wykluczyć z tunelu VPN.
Nie można uruchomić połączenia tunelowego. Wyślij zgłoszenie problemu.
Prześlij
Zmień lokalizację
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
index 99990283eeae..03c8aad24b28 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -228,7 +228,6 @@
Definições de VPN
Mostrar número de conta
Mostrar aplicações do sistema
- Escolha as aplicações que deseja excluir do túnel VPN.
Não foi possível iniciar a ligação de túnel. Envie um relatório do problema.
Enviar
Alterar local
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
index fc79400fc154..c96888d668a6 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -228,7 +228,6 @@
Настройки VPN
Показать номер учетной записи
Показывать системные приложения
- Выберите приложения, которые нужно исключить из туннеля VPN.
Не удалось запустить туннельное подключение. Отправьте сообщение о проблеме.
Отправить
Сменить местоположение
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
index dfe5f233084a..402b7663b9d5 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -228,7 +228,6 @@
VPN-inställningar
Visa kontonummer
Visa systemappar
- Välj de appar du vill exkludera från VPN-tunneln.
Det går inte att starta tunnelanslutning. Skicka en problemrapport.
Skicka
Växla plats
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
index a4c77a1f3b03..e9c733986242 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -228,7 +228,6 @@
การตั้งค่า VPN
แสดงหมายเลขบัญชี
แสดงแอประบบ
- เลือกแอปที่คุณต้องการแยกออกจากช่องทาง VPN
ไม่สามารถเริ่มการเชื่อมต่ออุโมงค์ได้ โปรดส่งรายงานปัญหา
ส่ง
สลับตำแหน่ง
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
index eaf2094bc440..0f9aaf615194 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -228,7 +228,6 @@
VPN ayarları
Hesap numarasını göster
Sistem uygulamalarını göster
- VPN tünelinden hariç tutmak istediğiniz uygulamaları seçin.
Tünel bağlantısı başlatılamıyor. Lütfen bir hata raporu gönderin.
Gönder
Konum değiştir
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
index e0a09eae8594..bef4e2ce873b 100644
--- 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,7 +228,6 @@
VPN 设置
显示帐号
显示系统应用
- 选择您想要从 VPN 隧道中排除的应用。
无法启动隧道连接。请发送问题报告。
提交
切换位置
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
index 6112e5ef84b2..799a0c1c41b8 100644
--- 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,7 +228,6 @@
VPN 設定
顯示帳號
顯示系統應用程式
- 選擇要從 VPN 通道中排除的應用程式。
無法啟動通道連線。請傳送問題回報。
提交
切換位置
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index ab02ca295e12..0956a97d0a79 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -154,7 +154,8 @@
Select location
Filter
While connected, your real location is masked with a private and secure location in the selected region.
- Choose the apps you want to exclude from the VPN tunnel.
+ Lets you select apps that should access the Internet directly without going through the VPN tunnel.
+ Attention: Split tunneling is a privacy risk.
Enable
Use custom DNS server
Add a server
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index e906a6dc035f..35df069d1846 100644
--- 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 Use custom DNS server."
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 ""