Skip to content

Commit

Permalink
Update auto-connect for TV users to legacy and update description
Browse files Browse the repository at this point in the history
  • Loading branch information
Rawa committed Jun 13, 2024
1 parent 889af23 commit 509a745
Show file tree
Hide file tree
Showing 22 changed files with 6 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -331,14 +331,7 @@ fun VpnSettingsScreen(
item {
Spacer(modifier = Modifier.height(Dimens.cellLabelVerticalPadding))
HeaderSwitchComposeCell(
title =
stringResource(
if (state.systemVpnSettingsAvailable) {
R.string.auto_connect_legacy
} else {
R.string.auto_connect
}
),
title = stringResource(R.string.auto_connect_legacy),
isToggled = state.isAutoConnectEnabled,
isEnabled = true,
onCellClicked = { newValue -> onToggleAutoConnect(newValue) }
Expand All @@ -354,7 +347,7 @@ fun VpnSettingsScreen(
textResource(R.string.auto_connect_and_lockdown_mode)
)
} else {
textResource(R.string.auto_connect_footer)
textResource(R.string.auto_connect_footer_legacy_tv)
},
HtmlCompat.FROM_HTML_MODE_COMPACT
)
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Auto-tilslutning kaldes Altid-til VPN i Android-systemindstillingerne, og det sørger for, at du konstant er forbundet til VPN-tunnelen og automatisk forbinder efter genstart.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. For at aktivere Lockdown-tilstand skal du klikke på knappen ud for &lt;b&gt;Bloker forbindelser uden VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Lockdown-tilstand blokerer al internetadgang, hvis VPN-tunnelen afbrydes manuelt. &lt;br/&gt;&lt;b&gt;Advarsel: Denne indstilling blokerer opdelte apps og funktionen Lokal netværksdeling&lt;/b&gt;.</string>
<string name="auto_connect_footer">Opret automatisk forbindelse til en server, når appen starter.</string>
<string name="auto_connect_footer_legacy">Brug systemindstillingen &lt;b&gt;Altid til&lt;/b&gt; i stedet ved at følge vejledningen i &lt;b&gt;%1$s&lt;/b&gt; ovenfor.</string>
<string name="auto_connect_legacy">Automatisk forbindelse (ældre metode)</string>
<string name="automatic">Automatisk</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Die automatische Verbindung wird in den Android-Systemeinstellungen als „Always-on VPN“ bezeichnet und sorgt dafür, dass Sie ständig mit dem VPN-Tunnel verbunden sind und sich nach einem Neustart automatisch verbinden.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Um den Sperrmodus zu aktivieren, klicken Sie auf den Kippschalter neben &lt;b&gt;Verbindungen ohne VPN sperren&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Der Sperrmodus blockiert den gesamten Internetzugang, wenn die Verbindung zum VPN-Tunnel manuell unterbrochen wird. &lt;br/&gt;&lt;b&gt;Warnung: Diese Einstellung blockiert geteilte Anwendungen und das Teilen im lokalen Netzwerk&lt;/b&gt;.</string>
<string name="auto_connect_footer">Stellt automatisch eine Verbindung zum Server her, wenn die App startet.</string>
<string name="auto_connect_footer_legacy">Bitte verwenden Sie stattdessen die Systemeinstellung &lt;b&gt;Always-on (Durchgehend aktiv)&lt;/b&gt;, indem Sie die Anleitung oben unter &lt;b&gt;%1$s&lt;/b&gt; befolgen.</string>
<string name="auto_connect_legacy">Automatische Verbindung (veraltet)</string>
<string name="automatic">Automatisch</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">La conexión automática se llama VPN siempre activa en la configuración del sistema Android y asegura estar conectado constantemente al túnel de la VPN y conectarse automáticamente después de cada reinicio.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Para habilitar el modo de bloqueo, haga clic en el botón situado junto a &lt;b&gt;Bloquear conexiones sin VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">El modo de bloqueo bloquea todo el acceso a Internet si el túnel de la VPN está desconectado manualmente. &lt;br/&gt;&lt;b&gt;Advertencia: Este ajuste bloquea las aplicaciones divididas y la opción Uso compartido de la red local&lt;/b&gt;.</string>
<string name="auto_connect_footer">Al iniciarse la aplicación, se conecta automáticamente a un servidor.</string>
<string name="auto_connect_footer_legacy">En su lugar, utilice el ajuste de sistema &lt;b&gt;Siempre activado&lt;/b&gt; siguiendo arriba la guía en &lt;b&gt;%1$s&lt;/b&gt;.</string>
<string name="auto_connect_legacy">Conexión automática (heredada)</string>
<string name="automatic">Automático</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Automaattista yhdistämistä kutsutaan aina päällä olevaksi VPN-yhteydeksi Androidin järjestelmäasetuksissa. Se varmistaa, että olet jatkuvasti yhteydessä VPN-tunneliin, sekä muodostaa yhteyden automaattisesti aina uudelleenkäynnistyksen jälkeen.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Ota lukitustila käyttöön napsauttamalla &lt;b&gt;Estä yhteydet ilman VPN:ää&lt;/b&gt; -kohdan vierestä löytyvää valintapainiketta.</string>
<string name="auto_connect_carousel_third_slide_top_text">Lukitustila estää kaikki verkkoyhteydet, jos yhteys VPN-tunneliin katkaistaan manuaalisesti. &lt;br/&gt;&lt;b&gt;Varoitus: asetus estää sovelluskohtaisesti yhdistettävät sovellukset ja paikallisen verkon jakamisominaisuuden&lt;/b&gt;.</string>
<string name="auto_connect_footer">Muodosta yhteys palvelimeen automaattisesti, kun sovellus avataan.</string>
<string name="auto_connect_footer_legacy">Käytä &lt;b&gt;aina käytössä&lt;/b&gt; -järjestelmäasetusta seuraamalla ylhäältä löytyvää opasta aiheesta &lt;b&gt;%1$s&lt;/b&gt;.</string>
<string name="auto_connect_legacy">Autom. yhdistäminen (vanha järjestelmä)</string>
<string name="automatic">Automaattinen</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">La connexion automatique est appelée VPN toujours actif dans les paramètres du système Android et elle s\'assure que vous êtes constamment connecté au tunnel VPN et se connecte automatiquement après le redémarrage.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Pour activer le mode Verrouillage, cliquez sur l\'interrupteur situé à côté de &lt;b&gt;Bloquer les connexions sans VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Le mode Verrouillage bloque tout accès à Internet si le tunnel VPN est déconnecté manuellement. &lt;br/&gt;&lt;b&gt;Avertissement : Ce paramètre bloque les applications fractionnées et la fonctionnalité de partage du réseau local&lt;/b&gt;.</string>
<string name="auto_connect_footer">Connexion automatique à un serveur dès le démarrage de l\'application.</string>
<string name="auto_connect_footer_legacy">Veuillez utiliser le paramètre système &lt;b&gt;Toujours activé&lt;/b&gt; en suivant le guide dans &lt;b&gt;%1$s&lt;/b&gt; ci-dessus.</string>
<string name="auto_connect_legacy">Connexion automatique (obsolète)</string>
<string name="automatic">Automatique</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">La connessione automatica è denominata VPN sempre attiva nelle impostazioni del sistema Android e garantisce di essere costantemente connessi al tunnel VPN e di connettersi automaticamente dopo il riavvio.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Per abilitare la modalità di blocco, clicca sull\'interruttore accanto a &lt;b&gt;Blocca connessioni senza VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">La modalità Blocco blocca tutti gli accessi a Internet se il tunnel VPN viene disconnesso manualmente. &lt;br/&gt;&lt;b&gt;Avviso: questa impostazione blocca le app divise e la funzione di condivisione della rete locale&lt;/b&gt;.</string>
<string name="auto_connect_footer">Connettiti automaticamente al server all\'avvio dell\'app.</string>
<string name="auto_connect_footer_legacy">Utilizza piuttosto l\'impostazione di sistema &lt;b&gt;Sempre attivo&lt;/b&gt; seguendo la guida in &lt;b&gt;%1$s&lt;/b&gt; sopra.</string>
<string name="auto_connect_legacy">Connessione automatica (precedente)</string>
<string name="automatic">Automatico</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">自動接続はAndroidシステム設定で「Always-on VPN」と呼ばれており、確実に一貫してVPNトンネルに接続し、再起動の後に自動接続を行う機能です。</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. ロックダウンモードを有効にするには、[&lt;b&gt;VPNを使用していない接続をブロック&lt;/b&gt;] の横のトグルボタンをクリックします。</string>
<string name="auto_connect_carousel_third_slide_top_text">ロックダウンモードはVPNトンネルが手動で切断された場合にすべてのインターネットアクセスをブロックします。&lt;br/&gt;&lt;b&gt;警告: この設定は分割アプリとローカルネットワーク共有機能をブロックします。&lt;/b&gt;</string>
<string name="auto_connect_footer">アプリ起動時に自動的にサーバーに接続します。</string>
<string name="auto_connect_footer_legacy">上の &lt;b&gt;%1$s&lt;/b&gt; のガイドに従い、&lt;b&gt;Always-on&lt;/b&gt; のシステム設定を代わりに使用してください。</string>
<string name="auto_connect_legacy">自動接続 (レガシー)</string>
<string name="automatic">自動</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">자동 연결은 Android 시스템 설정에서 상시 접속 VPN이라고 하며 VPN 터널에 지속적으로 연결되고 다시 시작한 후 자동 연결되게 해줍니다.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. 잠금 모드를 활성화하려면 &lt;b&gt;VPN 없이 연결 차단&lt;/b&gt; 옆에 있는 토글을 클릭합니다.</string>
<string name="auto_connect_carousel_third_slide_top_text">VPN 터널이 수동으로 연결 해제되면 잠금 모드는 모든 인터넷 액세스를 차단합니다. &lt;br/&gt;&lt;b&gt;경고: 이 설정은 분할 앱과 로컬 네트워크 공유 기능을 차단합니다&lt;/b&gt;.</string>
<string name="auto_connect_footer">앱이 시작되면 자동으로 서버에 연결합니다.</string>
<string name="auto_connect_footer_legacy">위의 &lt;b&gt;%1$s&lt;/b&gt; 가이드에 따라 &lt;b&gt;상시 접속&lt;/b&gt; 시스템 설정을 대신 사용하세요.</string>
<string name="auto_connect_legacy">자동 연결(레거시)</string>
<string name="automatic">자동</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-my/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Android စနစ် ဆက်တင်တွင် အော်တိုချိတ်ဆက်မှုကို အမြဲဖွင့် VPN ဟုခေါ်ပြီး VPN Tunnel ကို အမြဲချိတ်ဆက်ထားကြောင်း သေချာစေပြီး အစမှ ပြန်ဖွင့်ပြီးနောက် အော်တို ချိတ်ဆက်ပါသည်။</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. လော့ခ်ဒေါင်းစနစ်ကို ဖွင့်ရန် &lt;b&gt;VPN မပါဘဲ ချိတ်ဆက်မှုများ ပိတ်ဆို့ရန်&lt;/b&gt; ဘေးရှိ ဖွင့်/ပိတ် ခလုတ်ကို နှိပ်ပါ။.</string>
<string name="auto_connect_carousel_third_slide_top_text">VPN Tunnel ကို ချိတ်ဆက်မှုမှ ကိုယ်တိုင် ဖြုတ်လိုက်ပါက လော့ခ်ဒေါင်းစနစ်သည် အင်တာနက် ရယူသုံးစွဲခွင့် အာလုံးကို ပိတ်ဆို့ပါသည်။ &lt;br/&gt;&lt;b&gt;သတိပြုရန်- ဤဆက်တင်သည် Split အက်ပ်များနှင့် ဒေသတွင်း ကွန်ရက် ဝေမျှမှု လုပ်ဆောင်ချက်ကို ပိတ်ဆို့ပါမည်&lt;/b&gt;။</string>
<string name="auto_connect_footer">အက်ပ် စတင်ဆောင်ရွက်ချိန်တွင် ဆာဗာနှင့် အော်တို ချိတ်ဆက်သွားပါမည်။</string>
<string name="auto_connect_footer_legacy">အထက်ပါ &lt;b&gt;%1$s&lt;/b&gt; တွင် အောက်ပါ လမ်းညွှန်အတိုင်း လိုက်နာခြင်းဖြင့် &lt;b&gt;အမြဲဖွင့်&lt;/b&gt; စနစ်ဆက်တင်ကို ‌အစားထိုး သုံးပါ။</string>
<string name="auto_connect_legacy">အော်တို ချိတ်ဆက်ရန် (ပင်မ)</string>
<string name="automatic">အလိုအလျောက်</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-nb/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Automatisk tilkobling heter «Alltid-på-VPN» i Androids systeminnstillinger og sørger for at du alltid er tilkoblet VPN-tunnelen og automatisk tilkobling etter omstart.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. For å aktivere låsemodus trykker du på bryteren ved siden av &lt;b&gt;Blokker tilkoblinger uten VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Låsemodusen blokkerer all internettilgang når VPN-tunnelen er manuelt frakoblet. &lt;br/&gt;&lt;b&gt;Advarsel: Innstillingen blokkerer delte apper og funksjonen Deling over lokalt nettverk&lt;/b&gt;.</string>
<string name="auto_connect_footer">Kobler automatisk til en server når appen starter.</string>
<string name="auto_connect_footer_legacy">Bruk systeminnstillingen &lt;b&gt;alltid på&lt;/b&gt; i stedet for å følge veiledningen i &lt;b&gt;%1$s&lt;/b&gt; ovenfor.</string>
<string name="auto_connect_legacy">Automatisk tilkobling (eldre)</string>
<string name="automatic">Automatisk</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Automatisch verbinden heet Altijd-aan VPN in de Android-systeeminstellingen en zorgt ervoor dat u altijd verbonden bent met de VPN-tunnel en automatisch verbinding maakt na een herstart.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Klik om Lockdownmodus in te schakelen op de schakelaar naast &lt;b&gt;Verbindingen zonder VPN blokkeren&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">De Lockdownmodus blokkeert alle internettoegang als de VPN-tunnel handmatig wordt verbroken. &lt;br&gt;&lt;b&gt;Waarschuwing: deze instelling blokkeert gesplitste apps en de functie Lokaal netwerk delen&lt;/b&gt;.</string>
<string name="auto_connect_footer">Automatisch verbinden met een server wanneer de app wordt gestart.</string>
<string name="auto_connect_footer_legacy">Gebruik in plaats hiervan de systeeminstelling &lt;b&gt;Altijd aan&lt;/b&gt; door de aanwijzingen hierboven in &lt;b&gt;%1$s&lt;/b&gt; te volgen.</string>
<string name="auto_connect_legacy">Automatisch verbinden (verouderd)</string>
<string name="automatic">Automatisch</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">Automatyczne łączenie w ustawieniach systemu Android nazywa się „Zawsze włączony VPN” i zapewnia stałe połączenie z tunelem VPN oraz automatyczne łączenie po ponownym uruchomieniu.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Aby włączyć tryb Lockdown, kliknij przełącznik opcji &lt;b&gt;Blokuj połączenia bez VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Jeśli tunel VPN jest ręcznie odłączony, wówczas tryb Lockdown całkowicie blokuje dostęp do Internetu. &lt;br/&gt;&lt;b&gt;Ostrzeżenie: to ustawienie blokuje aplikacje dzielące i udostępnianie sieci lokalnej&lt;/b&gt;.</string>
<string name="auto_connect_footer">Automatycznie łącz z serwerem po uruchomieniu aplikacji.</string>
<string name="auto_connect_footer_legacy">Zamiast tego użyj ustawienia systemowego &lt;b&gt;Zawsze włączone&lt;/b&gt;, postępując zgodnie z poradnikiem w powyższej sekcji &lt;b&gt;%1$s&lt;/b&gt;.</string>
<string name="auto_connect_legacy">Automatyczne łączenie (starsza wersja)</string>
<string name="automatic">Automatycznie</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">A ligação automática é designada por VPN sempre ligada nas definições do sistema Android e assegura que está constantemente ligado ao túnel VPN e ligar-se-á automaticamente após o reinício.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Para ativar o modo de bloqueio, clique no botão de alternar junto a &lt;b&gt;Bloquear ligações sem VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">O modo de bloqueio bloqueia todo o acesso à internet se o túnel VPN for desligado manualmente. &lt;br/&gt;&lt;b&gt;Aviso: esta definição bloqueia as apps divididas e a funcionalidade de partilha de rede local&lt;/b&gt;.</string>
<string name="auto_connect_footer">Liga-se automaticamente a um servidor quando a app inicia.</string>
<string name="auto_connect_footer_legacy">Alternativamente, utilize a definição de sistema &lt;b&gt;Sempre ligada&lt;/b&gt;, seguindo o guia em &lt;b&gt;%1$s&lt;/b&gt; acima.</string>
<string name="auto_connect_legacy">Ligação automática (método antigo)</string>
<string name="automatic">Automático</string>
Expand Down
1 change: 0 additions & 1 deletion android/lib/resource/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<string name="auto_connect_carousel_second_slide_top_text">В системных настройках Android автоподключение называется «Постоянная VPN». Эта опция обеспечивает постоянное подключение к туннелю VPN и автоподключение после перезапуска.</string>
<string name="auto_connect_carousel_third_slide_bottom_text">3. Чтобы включить режим блокировки, нажмите на переключатель возле &lt;b&gt;Блокировать соединения без VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_third_slide_top_text">Режим блокировки блокирует весь доступ к Интернету, если туннель VPN отключен вручную. &lt;br/&gt;&lt;b&gt;Внимание: эта опция блокирует приложения с раздельным туннелированием и функцию обмена данными в локальной сети&lt;/b&gt;.</string>
<string name="auto_connect_footer">Автоматически подключаться к серверу при запуске приложения.</string>
<string name="auto_connect_footer_legacy">Вместо этого используйте системную настройку &lt;b&gt;Постоянная VPN&lt;/b&gt;, следуя инструкциям в разделе &lt;b&gt;%1$s&lt;/b&gt; выше.</string>
<string name="auto_connect_legacy">Автоподключение (устаревшее)</string>
<string name="automatic">Автоматически</string>
Expand Down
Loading

0 comments on commit 509a745

Please sign in to comment.