Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update auto-connect for TV users to legacy and update description #6345

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class VpnSettingsScreenTest {
)
}

onNodeWithText("Auto-connect").assertExists()
onNodeWithText("Auto-connect (legacy)").assertExists()

onNodeWithTag(LAZY_LIST_TEST_TAG)
.performScrollToNode(hasTestTag(LAZY_LIST_LAST_ITEM_TEST_TAG))
Expand Down
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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Indstillingerne for automatisk forbindelse og Lockdown-tilstand kan findes i Android- systemindstillingerne. Følg denne vejledning for at aktivere en eller begge.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. For at aktivere automatisk forbindelse skal du klikke på knappen ud for &lt;b&gt;Altid-til VPN&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Die Einstellungen für die automatische Verbindung und den Sperrmodus finden Sie in den Android-Systemeinstellungen. Folgen Sie dieser Anleitung, um eine oder beide Einstellungen zu aktivieren.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Um die automatische Verbindung zu aktivieren, klicken Sie auf den Kippschalter neben &lt;b&gt;Always-on VPN&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">La configuración del modo de bloqueo y de la conexión automática puede encontrarse en la configuración del sistema Android, siga esta guía para habilitar uno o ambos.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Para habilitar la conexión automática, haga clic en el botón &lt;b&gt;VPN siempre activa&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Automaattisen yhdistämisen ja lukitustilan asetukset löytyvät Androidin järjestelmäasetuksista. Voit ottaa jommankumman tai molemmat käyttöön tämän oppaan ohjeilla.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Ota automaattinen yhteyden muodostus käyttöön napsauttamalla &lt;b&gt;Aina päällä oleva VPN&lt;/b&gt; -kohdan vieressä olevaa valintapainiketta.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Les paramètres de la connexion automatique et du mode Verrouillage se trouvent dans les paramètres du système Android, suivez ce guide pour activer l\'un, l\'autre ou les deux.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Pour activer la connexion automatique, cliquez sur l\'interrupteur situé à côté de &lt;b&gt;VPN toujours actif&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Le impostazioni della modalità di Connessione automatica e di Blocco si trovano nelle impostazioni del sistema Android. Segui questa guida per abilitare una o entrambe.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Per abilitare la connessione automatica, clicca sull\'interruttore accanto a &lt;b&gt;VPN sempre attiva&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">自動接続とロックダウンモードの設定はAndroidシステム設定にあります。どちらか、または両方をこのガイドに従って有効にしてください。</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. 自動接続を有効にするには、[&lt;b&gt;Always-on VPN&lt;/b&gt;] の横のトグルボタンをクリックします。</string>
<string name="auto_connect_carousel_second_slide_top_text">自動接続はAndroidシステム設定で「Always-on VPN」と呼ばれており、確実に一貫してVPNトンネルに接続し、再起動の後に自動接続を行う機能です。</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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">자동 연결 및 잠금 모드 설정은 Android 시스템 설정에서 찾을 수 있습니다. 이 가이드에 따라 하나 또는 둘 다를 활성화하세요.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. 자동 연결을 활성화하려면 &lt;b&gt;상시 접속 VPN&lt;/b&gt; 옆에 있는 토글을 클릭합니다.</string>
<string name="auto_connect_carousel_second_slide_top_text">자동 연결은 Android 시스템 설정에서 상시 접속 VPN이라고 하며 VPN 터널에 지속적으로 연결되고 다시 시작한 후 자동 연결되게 해줍니다.</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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">အော်တို ချိတ်ဆက်မှုနှင့် လော့ခ်ဒေါင်းစနစ် ဆက်တင်များကို Android စနစ် ဆက်တင်များတွင် ရှာတွေ့နိုင်ပြီး တစ်ခု သို့မဟုတ် နှစ်ခုလုံးကို ဖွင့်ရန် ဤလမ်းညွှန်ချက်ကို လိုက်နာပါ။</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. အော်တို ချိတ်ဆက်မှု ဖွင့်ရန် &lt;b&gt;အမြဲဖွင့် VPN&lt;/b&gt; ဘေးရှိ ဖွင့်/ပိတ် ခလုတ်ကို နှိပ်ပါ။</string>
<string name="auto_connect_carousel_second_slide_top_text">Android စနစ် ဆက်တင်တွင် အော်တိုချိတ်ဆက်မှုကို အမြဲဖွင့် VPN ဟုခေါ်ပြီး VPN Tunnel ကို အမြဲချိတ်ဆက်ထားကြောင်း သေချာစေပြီး အစမှ ပြန်ဖွင့်ပြီးနောက် အော်တို ချိတ်ဆက်ပါသည်။</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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Du finner innstillingene for automatisk tilkobling og låsemodus i Androids systeminnstillinger. Følg denne veiledningen for å aktivere én eller begge.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. For å aktivere Automatisk tilkobling trykker du på bryteren ved siden av &lt;b&gt;VPN alltid på&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">De instellingen Automatisch verbinden en Lockdownmodus zijn te vinden in de Android-systeeminstellingen, volg deze gids om een of beide in te schakelen.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Klik om Automatisch verbinden in te schakelen op de schakelaar naast &lt;b&gt;Altijd-aan VPN&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Ustawienia trybu automatycznego łączenia i trybu Lockdown można znaleźć w ustawieniach systemu Android. Aby włączyć jeden lub oba tryby, postępuj zgodnie z niniejszym poradnikiem.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Aby włączyć automatyczne łączenie, kliknij przełącznik obok opcji &lt;b&gt;Zawsze włączony VPN&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">As definições da ligação automática e do modo de bloqueio podem ser encontradas nas definições do sistema Android. Siga este guia para ativar uma ou ambas as funcionalidades.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Para ativar a ligação automática, clique no botão de alternar junto a &lt;b&gt;VPN sempre ligada&lt;/b&gt;.</string>
<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_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 @@ -33,7 +33,6 @@
<string name="auto_connect_carousel_first_slide_top_text">Настройки автоподключения и режима блокировки можно найти в системных настройках Android. Чтобы включить их, следуйте этой инструкции.</string>
<string name="auto_connect_carousel_second_slide_bottom_text">2. Чтобы включить автоподключение, нажмите на переключатель возле опции &lt;b&gt;Постоянная VPN&lt;/b&gt;.</string>
<string name="auto_connect_carousel_second_slide_top_text">В системных настройках Android автоподключение называется «Постоянная VPN». Эта опция обеспечивает постоянное подключение к туннелю VPN и автоподключение после перезапуска.</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
Loading