diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-03-21 13:00:02 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-03-21 23:11:47 +0100 |
| commit | 38a1fcde773a87866c874fcb38746c2efac17958 (patch) | |
| tree | bf1cf988ca1d087007ecf96f0d2aa3cbd1a9ce78 /android | |
| parent | e0c7be104ca84e1415591f710841e710d307e6c3 (diff) | |
| download | mullvadvpn-38a1fcde773a87866c874fcb38746c2efac17958.tar.xz mullvadvpn-38a1fcde773a87866c874fcb38746c2efac17958.zip | |
Fix duplicate dns content blockers string
Diffstat (limited to 'android')
23 files changed, 23 insertions, 24 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt index ef62511061..ec2ff5e36f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SwitchComposeCell.kt @@ -185,7 +185,7 @@ fun CustomDnsCellSubtitle(isCellClickable: Boolean, modifier: Modifier) { } else { textResource( id = R.string.custom_dns_disable_mode_subtitle, - textResource(id = R.string.dns_content_blockers_title), + textResource(id = R.string.dns_content_blockers), ) } Text( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt index 6d032e1af0..ae53c99c4d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/FeatureIndicatorsPanel.kt @@ -87,7 +87,7 @@ private fun FeatureIndicator.text(): String { FeatureIndicator.SHADOWSOCKS, FeatureIndicator.UDP_2_TCP -> R.string.feature_udp_2_tcp FeatureIndicator.LAN_SHARING -> R.string.feature_lan_sharing - FeatureIndicator.DNS_CONTENT_BLOCKERS -> R.string.feature_dns_content_blockers + FeatureIndicator.DNS_CONTENT_BLOCKERS -> R.string.dns_content_blockers FeatureIndicator.CUSTOM_DNS -> R.string.feature_custom_dns FeatureIndicator.SERVER_IP_OVERRIDE -> R.string.feature_server_ip_override FeatureIndicator.CUSTOM_MTU -> R.string.feature_custom_mtu diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt index 2989dba047..8a43327fd3 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt @@ -364,7 +364,7 @@ fun VpnSettingsScreen( itemWithDivider { ExpandableComposeCell( - title = stringResource(R.string.dns_content_blockers_title), + title = stringResource(R.string.dns_content_blockers), isExpanded = expandContentBlockersState, isEnabled = !state.isCustomDnsEnabled, onInfoClicked = { navigateToContentBlockersInfo() }, 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 a794dbf8d3..023de1277b 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Afbrudt (ingen VPN-tilladelse)</string> <string name="disconnecting">Afbryder...</string> <string name="dismiss">Afvis</string> + <string name="dns_content_blockers">DNS-indholdsblokkere</string> <string name="dns_content_blockers_custom_dns_warning">Bemærk: Denne indstilling kan ikke bruges i kombination med \"Brug brugerdefineret DNS-server\".</string> <string name="dns_content_blockers_info">Når denne funktion er aktiveret, forhindrer den enheden i at kontakte bestemte domæner eller websteder, der er kendt for at distribuere annoncer, malware, trackere og lignende.</string> <string name="dns_content_blockers_subtitle">Deaktiver \"%1$s\" nedenfor for at aktivere disse indstillinger.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Ofte stillede spørgsmål og vejledninger</string> <string name="feature_custom_dns">Brugerdefineret DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-indholdsblokkere</string> <string name="feature_indicators_show_more">%1$s mere...</string> <string name="feature_lan_sharing">Lokal netværksdeling</string> <string name="feature_quantum_resistant">Kvantemodstand</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 index dc7cc77e56..f3365cad16 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Verbindung getrennt (keine VPN-Berechtigung)</string> <string name="disconnecting">Verbindung wird getrennt …</string> <string name="dismiss">Ausblenden</string> + <string name="dns_content_blockers">DNS-Inhaltssperren</string> <string name="dns_content_blockers_custom_dns_warning">Achtung: Diese Einstellung kann nicht in Kombination mit der Option „Benutzerdefinierten DNS-Server verwenden“ verwendet werden.</string> <string name="dns_content_blockers_info">Wenn diese Funktion aktiviert ist, wird das Gerät daran gehindert, bestimmte Domains oder Websites zu kontaktieren, die für die Verbreitung von Werbung, Malware, Trackern und mehr bekannt sind.</string> <string name="dns_content_blockers_subtitle">Deaktivieren Sie unten „%1$s“, um diese Einstellungen zu aktivieren.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Häufig gestellte Fragen & Anleitungen</string> <string name="feature_custom_dns">Eigenes DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-Inhaltssperren</string> <string name="feature_indicators_show_more">%1$s weitere …</string> <string name="feature_lan_sharing">Teilen im lokalen Netzwerk</string> <string name="feature_quantum_resistant">Quantenresistenz</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 index 21576c0185..f37426155b 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Desconectado (sin permiso de VPN)</string> <string name="disconnecting">Desconectando...</string> <string name="dismiss">Descartar</string> + <string name="dns_content_blockers">Bloqueadores de contenido DNS</string> <string name="dns_content_blockers_custom_dns_warning">Atención: este ajuste no se puede utilizar en combinación con «Usar servidor DNS personalizado».</string> <string name="dns_content_blockers_info">Al activar esta opción se evita que el dispositivo contacte con determinados dominios o sitios web que se sabe que distribuyen anuncios, malware, rastreadores y más.</string> <string name="dns_content_blockers_subtitle">Deshabilite «%1$s» abajo para activar estos ajustes.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Preguntas frecuentes y guías</string> <string name="feature_custom_dns">DNS personalizado</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">Bloqueadores de contenido DNS</string> <string name="feature_indicators_show_more">%1$s más...</string> <string name="feature_lan_sharing">Uso compartido de la red local</string> <string name="feature_quantum_resistant">Resistencia cuántica</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 index 436e72ccb6..c396f8bb26 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Yhteys katkaistu (ei VPN-käyttöoikeutta)</string> <string name="disconnecting">Katkaistaan yhteyttä...</string> <string name="dismiss">Jätä huomiotta</string> + <string name="dns_content_blockers">DNS-sisällönestotoiminnot</string> <string name="dns_content_blockers_custom_dns_warning">Huomio: asetusta ei voi käyttää yhdessä \"Käytä mukautettua DNS-palvelinta\" -asetuksen kanssa.</string> <string name="dns_content_blockers_info">Kun tämä ominaisuus on käytössä, se estää laitetta ottamasta yhteyttä tiettyihin verkkotunnuksiin tai -sivustoihin, jotka tunnetaan mainosten, haittaohjelmien, seurantaohjelmien tai muiden vastaavien jakelijoina.</string> <string name="dns_content_blockers_subtitle">Ota nämä asetukset käyttöön poistamalla \"%1$s\" käytöstä alta.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Usein kysytyt kysymykset ja oppaat</string> <string name="feature_custom_dns">Mukautettu DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-sisällönestotoiminnot</string> <string name="feature_indicators_show_more">%1$s lisää...</string> <string name="feature_lan_sharing">Paikallisen verkon jakaminen</string> <string name="feature_quantum_resistant">Kvanttihyökkäysten esto</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 index a6965ebc13..c1e5edfada 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Déconnecté (aucune autorisation VPN)</string> <string name="disconnecting">Déconnexion en cours...</string> <string name="dismiss">Ignorer</string> + <string name="dns_content_blockers">Bloqueurs de contenu DNS</string> <string name="dns_content_blockers_custom_dns_warning">Attention : ce paramètre ne peut pas être utilisé en combinaison avec « Utiliser un serveur DNS personnalisé ».</string> <string name="dns_content_blockers_info">Lorsque cette fonctionnalité est activée, elle empêche l\'appareil de contacter certains domaines ou sites Web connus pour distribuer des publicités, des logiciels malveillants, des trackers et plus.</string> <string name="dns_content_blockers_subtitle">Désactivez « %1$s » ci-dessous pour activer ces paramètres.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">FAQ et guides</string> <string name="feature_custom_dns">DNS personnalisé</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">Bloqueurs de contenu DNS</string> <string name="feature_indicators_show_more">%1$s autre(s)...</string> <string name="feature_lan_sharing">Partage réseau local</string> <string name="feature_quantum_resistant">Résistance quantique</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 index 7b81bf6110..6bf0060893 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Disconnesso (nessuna autorizzazione VPN)</string> <string name="disconnecting">Disconnessione...</string> <string name="dismiss">Ignora</string> + <string name="dns_content_blockers">Blocchi dei contenuti DNS</string> <string name="dns_content_blockers_custom_dns_warning">Attenzione: questa impostazione non può essere utilizzata in combinazione con \"Usa un server DNS personalizzato\".</string> <string name="dns_content_blockers_info">Quando è abilitata, questa funzionalità impedisce al dispositivo di contattare determinati domini o siti Web noti per la distribuzione di annunci, malware, tracker e altro.</string> <string name="dns_content_blockers_subtitle">Disabilita \"%1$s\" di seguito per attivare queste impostazioni.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">FAQ e guide</string> <string name="feature_custom_dns">DNS personalizzato</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">Blocchi dei contenuti DNS</string> <string name="feature_indicators_show_more">Altri %1$s...</string> <string name="feature_lan_sharing">Condivisione rete locale</string> <string name="feature_quantum_resistant">Resistenza ad attacchi quantistici</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 index 0b1f41130e..cdc9ad0984 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">接続が解除されました (VPN のアクセス許可なし)</string> <string name="disconnecting">接続解除中...</string> <string name="dismiss">閉じる</string> + <string name="dns_content_blockers">DNSコンテンツブロッカー</string> <string name="dns_content_blockers_custom_dns_warning">注意: この設定を [カスタムDNSサーバーを使う] と一緒に使用することはできません。</string> <string name="dns_content_blockers_info">この機能を有効にすると、広告、マルウェア、トラッカーなどの配信が確認されている特定のドメインまたはWebサイトへのデバイスの接続が阻止されます。</string> <string name="dns_content_blockers_subtitle">これらの設定を有効にするには、下の [%1$s] を無効にしてください。</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">よくある質問とガイド</string> <string name="feature_custom_dns">カスタムDNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNSコンテンツブロッカー</string> <string name="feature_indicators_show_more">その他%1$s件…</string> <string name="feature_lan_sharing">ローカルネットワーク共有</string> <string name="feature_quantum_resistant">耐量子</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 index 54875e0969..0ff9c636a2 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">연결되지 않음(VPN 권한 없음)</string> <string name="disconnecting">연결 해제 중...</string> <string name="dismiss">해제</string> + <string name="dns_content_blockers">DNS 콘텐츠 차단기</string> <string name="dns_content_blockers_custom_dns_warning">주의: 이 설정은 \"사용자 지정 DNS 서버 사용\"과 함께 사용할 수 없습니다.</string> <string name="dns_content_blockers_info">이 기능이 활성화되면 광고, 맬웨어, 트래커 등을 배포하는 것으로 알려진 특정 도메인이나 웹사이트에 장치가 연결하지 않게 방지됩니다.</string> <string name="dns_content_blockers_subtitle">이 설정을 활성화하려면 아래의 \"%1$s\"를 비활성화하세요.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">FAQ 및 가이드</string> <string name="feature_custom_dns">사용자 지정 DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS 콘텐츠 차단기</string> <string name="feature_indicators_show_more">%1$s개 더 보기...</string> <string name="feature_lan_sharing">로컬 네트워크 공유</string> <string name="feature_quantum_resistant">양자 저항</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 index 565236efc8..0e7c02bb3d 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">ချိတ်ဆက်မှုဖြုတ်ထားသည် (VPN ခွင့်ပြုချက် မရှိပါ)</string> <string name="disconnecting">ချိတ်ဆက်မှုဖြုတ်နေသည်...</string> <string name="dismiss">ဖယ်ပစ်ရန်</string> + <string name="dns_content_blockers">DNS အကြောင်းအရာ ပိတ်ဆို့မှုများ</string> <string name="dns_content_blockers_custom_dns_warning">သတိပြုရန်- ဤဆက်တင်ကို \"စိတ်ကြိုက် DNS ဆာဗာကို သုံးရန်\" နှင့် အတူတွဲပြီး သုံးစွဲ၍မရပါ။</string> <string name="dns_content_blockers_info">ဤလုပ်ဆောင်ချက်ကို ဖွင့်ထားသည့်အခါ အနှောင့်အယှက်ဖြစ်စေသည့် ကြော်ငြာများ၊ မဲလ်ဝဲရ်၊ ခြေရာခံများနှင့် အစရှိသည်တို့နှင့်စပ်လျဉ်း၍ သိရှိထားသော အချို့သော Domain များ သို့မဟုတ် ဝဘ်ဆိုက်များနှင့် ဆက်သွယ်ခြင်းမှ စက်ကို ရပ်တန့်ပေးပါသည်။</string> <string name="dns_content_blockers_subtitle">ဤဆက်တင်များကို ဖွင့်ရန် အောက်ပါ \"%1$s\" ကို ပိတ်ပါ။</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">မေးလေ့ရှိသည့် မေးခွန်းများနှင့် လမ်းညွှန်များ</string> <string name="feature_custom_dns">စိတ်ကြိုက် DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS အကြောင်းအရာ ပိတ်ဆို့မှုများ</string> <string name="feature_indicators_show_more">နောက်ထပ် %1$s ခု...</string> <string name="feature_lan_sharing">လိုကယ် ကွန်ရက် ဝေမျှမှု</string> <string name="feature_quantum_resistant">Quantum ခုခံမှု</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 index fa4ff74476..de3ae99811 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Frakoblet (ingen VPN-tillatelse)</string> <string name="disconnecting">Kobler fra …</string> <string name="dismiss">Ignorer</string> + <string name="dns_content_blockers">DNS-innholdsblokkering</string> <string name="dns_content_blockers_custom_dns_warning">OBS: Denne innstillingen kan ikke brukes sammen med «Bruk egendefinert DNS-server».</string> <string name="dns_content_blockers_info">Når denne funksjonen er aktivert, forhindrer den enheten fra å kontakte bestemte domener og nettsteder som er kjent for å spre annonser, skadelig programvare, sporingsenheter og mer.</string> <string name="dns_content_blockers_subtitle">Deaktiver «%1$s» nedenfor for å aktivere innstillingene.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Ofte stilte spørsmål og veiledninger</string> <string name="feature_custom_dns">Tilpasset DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-innholdsblokkering</string> <string name="feature_indicators_show_more">%1$s til …</string> <string name="feature_lan_sharing">Deling over lokalt nettverk</string> <string name="feature_quantum_resistant">Kvantemotstand</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 index 389e985741..4f3101b518 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Verbinding verbroken (geen VPN-toestemming)</string> <string name="disconnecting">Verbinding wordt verbroken...</string> <string name="dismiss">Negeren</string> + <string name="dns_content_blockers">DNS-contentblokkeringen</string> <string name="dns_content_blockers_custom_dns_warning">Let op: deze instelling kan niet worden gebruikt in combinatie met \"Aangepaste DNS-server gebruiken\".</string> <string name="dns_content_blockers_info">Als deze functie is ingeschakeld, maakt het apparaat geen contact meer met bepaalde domeinen of websites waarvan bekend is dat ze advertenties, malware, trackers en meer verspreiden.</string> <string name="dns_content_blockers_subtitle">Schakel \"%1$s\" hieronder uit om deze instellingen te activeren.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Veelgestelde vragen en gidsen</string> <string name="feature_custom_dns">Aangepaste DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-contentblokkeringen</string> <string name="feature_indicators_show_more">Nog %1$s...</string> <string name="feature_lan_sharing">Delen op lokaal netwerk</string> <string name="feature_quantum_resistant">Kwantumbestendigheid</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 index 4cddc001c5..42592f6ce1 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Rozłączono (brak uprawnienia VPN)</string> <string name="disconnecting">Rozłączanie...</string> <string name="dismiss">Odrzuć</string> + <string name="dns_content_blockers">Funkcje blokowania treści DNS</string> <string name="dns_content_blockers_custom_dns_warning">Uwaga: tego ustawienia nie można używać w połączeniu z opcją „Użyj niestandardowego serwera DNS”.</string> <string name="dns_content_blockers_info">Po włączeniu funkcja ta uniemożliwia urządzeniu kontakt z określonymi domenami lub witrynami internetowymi, które rozpowszechniają reklamy, złośliwe oprogramowanie itd.</string> <string name="dns_content_blockers_subtitle">Aby aktywować te ustawienia, wyłącz opcję „%1$s” poniżej.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Często zadawane pytania i poradniki</string> <string name="feature_custom_dns">Niestandardowy serwer DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">Funkcje blokowania treści DNS</string> <string name="feature_indicators_show_more">Jeszcze %1$s...</string> <string name="feature_lan_sharing">Udostępnianie sieci lokalnej</string> <string name="feature_quantum_resistant">Odporność na ataki z użyciem komputerów kwantowych</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 index 11ad489d26..182e677168 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Desligado (sem permissão de VPN)</string> <string name="disconnecting">A desligar...</string> <string name="dismiss">Dispensar</string> + <string name="dns_content_blockers">Bloqueadores de conteúdo de DNS</string> <string name="dns_content_blockers_custom_dns_warning">Atenção: esta definição não pode ser utilizada em combinação com \"Utilizar servidor DNS personalizado\".</string> <string name="dns_content_blockers_info">Quando esta funcionalidade é ativada, impede que o dispositivo contacte certos domínios ou sites conhecidos por distribuir anúncios, malware, trackers e muito mais.</string> <string name="dns_content_blockers_subtitle">Desative \"%1$s\" abaixo para ativar estas definições.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Perguntas frequentes e guias</string> <string name="feature_custom_dns">DNS personalizado</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">Bloqueadores de conteúdo de DNS</string> <string name="feature_indicators_show_more">Mais %1$s...</string> <string name="feature_lan_sharing">Partilha de rede local</string> <string name="feature_quantum_resistant">Resistência quântica</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 index 3a5fae34d0..b88175fabd 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Отключено (нет разрешения для VPN)</string> <string name="disconnecting">Отключение...</string> <string name="dismiss">Закрыть</string> + <string name="dns_content_blockers">DNS-блокировщики контента</string> <string name="dns_content_blockers_custom_dns_warning">Внимание! Этот параметр нельзя использовать вместе с параметром «Пользовательский DNS-сервер».</string> <string name="dns_content_blockers_info">При включенной опции устройство не будет устанавливать соединение с определенными доменами и сайтами, известными распространением рекламы, вредоносного ПО, трекеров и т. д.</string> <string name="dns_content_blockers_subtitle">Чтобы активировать эти параметры, отключите параметр «%1$s».</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Ответы на вопросы и руководства</string> <string name="feature_custom_dns">Пользовательский DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-блокировщики контента</string> <string name="feature_indicators_show_more">Еще %1$s...</string> <string name="feature_lan_sharing">Обмен данными в локальной сети</string> <string name="feature_quantum_resistant">Квантовая устойчивость</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 index ecd1e23c42..709b6878ef 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Frånkopplad (VPN-behörighet saknas)</string> <string name="disconnecting">Kopplar från ...</string> <string name="dismiss">Ignorera</string> + <string name="dns_content_blockers">DNS-innehållsblockerare</string> <string name="dns_content_blockers_custom_dns_warning">Obs! Den här inställningen kan inte användas tillsammans med \"Använd anpassad DNS-server\".</string> <string name="dns_content_blockers_info">När den här funktionen är aktiverad stoppas enheten från att kontakta vissa domäner eller webbplatser som är kända för att sprida annonser, skadlig kod, spårare med mera.</string> <string name="dns_content_blockers_subtitle">Inaktivera \"%1$s\" nedan för att aktivera dessa inställningar.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">Vanliga frågor och guider</string> <string name="feature_custom_dns">Anpassad DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS-innehållsblockerare</string> <string name="feature_indicators_show_more">%1$s till ...</string> <string name="feature_lan_sharing">Lokal nätverksdelning</string> <string name="feature_quantum_resistant">Kvantresistens</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 index 1b9c0eee33..bcc5213f37 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">ตัดการเชื่อมต่อแล้ว (ไม่มีสิทธิ์ VPN)</string> <string name="disconnecting">กำลังตัดการเชื่อมต่อ...</string> <string name="dismiss">ละทิ้ง</string> + <string name="dns_content_blockers">ตัวบล็อกเนื้อหา DNS</string> <string name="dns_content_blockers_custom_dns_warning">โปรดทราบ: การตั้งค่านี้ไม่สามารถใช้ร่วมกับ \"ใช้เซิร์ฟเวอร์ DNS แบบกำหนดเองได้\"</string> <string name="dns_content_blockers_info">ในขณะที่เปิดใช้งานคุณลักษณะนี้ คุณลักษณะนี้จะหยุดไม่ให้อุปกรณ์ติดต่อโดเมน หรือเว็บไซต์ใดๆ ที่เป็นที่ทราบกันว่า ใช้ในการเผยแพร่โฆษณา มัลแวร์ ตัวติดตาม และอื่นๆ</string> <string name="dns_content_blockers_subtitle">ปิดใช้งาน \"%1$s\" ด้านล่าง เพื่อเปิดใช้การตั้งค่าเหล่านี้</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">คำถามที่พบบ่อยและคำแนะนำ</string> <string name="feature_custom_dns">DNS แบบกำหนดเอง</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">ตัวบล็อกเนื้อหา DNS</string> <string name="feature_indicators_show_more">อีก %1$s...</string> <string name="feature_lan_sharing">การแชร์ในเครือข่ายท้องถิ่น</string> <string name="feature_quantum_resistant">การต่อต้านควอนตัม</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 index 68b3af0210..9ddc614cdb 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">Bağlantı kesildi (VPN izni yok)</string> <string name="disconnecting">Bağlantı kesiliyor...</string> <string name="dismiss">Reddet</string> + <string name="dns_content_blockers">DNS içerik engelleyiciler</string> <string name="dns_content_blockers_custom_dns_warning">Dikkat: Bu ayar, \"Özel DNS sunucusu kullan\" seçeneği ile birlikte kullanılamaz.</string> <string name="dns_content_blockers_info">Bu özellik etkinleştirildiğinde, cihazınızın reklamlar, kötü amaçlı yazılımlar, izleyiciler ve daha fazlasını dağıttığı bilinen belirli alan adlarıyla veya web siteleriyle iletişim kurmasını durdurur.</string> <string name="dns_content_blockers_subtitle">Bu ayarları etkinleştirmek için aşağıdaki \"%1$s\" seçeneğini devre dışı bırakın.</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">SSS ve Kılavuzlar</string> <string name="feature_custom_dns">Özel DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS içerik engelleyiciler</string> <string name="feature_indicators_show_more">%1$s tane daha...</string> <string name="feature_lan_sharing">Yerel ağ paylaşımı</string> <string name="feature_quantum_resistant">Kuantum direnci</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 index b04b23f2e5..0349495c9b 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 @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">已断开连接(无 VPN 权限)</string> <string name="disconnecting">正在断开连接…</string> <string name="dismiss">关闭</string> + <string name="dns_content_blockers">DNS 内容阻止程序</string> <string name="dns_content_blockers_custom_dns_warning">注意:此设置不能与“使用自定义 DNS 服务器”结合使用。</string> <string name="dns_content_blockers_info">启用此功能后,它将阻止设备与已知的分发广告、恶意软件、跟踪器等内容的特定域或网站联系。</string> <string name="dns_content_blockers_subtitle">禁用下方的“%1$s”以激活这些设置。</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">常见问题解答与指南</string> <string name="feature_custom_dns">自定义 DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS 内容阻止程序</string> <string name="feature_indicators_show_more">其他 %1$s 个…</string> <string name="feature_lan_sharing">本地网络共享</string> <string name="feature_quantum_resistant">量子阻力</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 index cab404e8e3..a128bbdc17 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 @@ -138,6 +138,7 @@ <string name="disconnected_vpn_permission_error">已中斷連線 (無 VPN 權限)</string> <string name="disconnecting">正在中斷連線…</string> <string name="dismiss">取消</string> + <string name="dns_content_blockers">DNS 內容封鎖程式</string> <string name="dns_content_blockers_custom_dns_warning">注意:此設定不能與「使用自訂 DNS 伺服器」共同使用。</string> <string name="dns_content_blockers_info">此功能啟用後,便會禁止裝置聯繫某些已知會傳播廣告、惡意軟體、追蹤程式等內容的網域或網站。</string> <string name="dns_content_blockers_subtitle">停用下方的「%1$s」以啟動這些設定。</string> @@ -176,7 +177,6 @@ <string name="faqs_and_guides">常見問題集與指南</string> <string name="feature_custom_dns">自訂 DNS</string> <string name="feature_custom_mtu">MTU</string> - <string name="feature_dns_content_blockers">DNS 內容封鎖程式</string> <string name="feature_indicators_show_more">其他 %1$s 個…</string> <string name="feature_lan_sharing">本機網路分享</string> <string name="feature_quantum_resistant">抗量子</string> diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index efc2946d5b..a9aca51636 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -180,7 +180,6 @@ <string name="add_dns_server_dialog_title">Add DNS server</string> <string name="update_dns_server_dialog_title">Update DNS server</string> <string name="duplicate_address_warning">This address has already been entered.</string> - <string name="dns_content_blockers_title">DNS content blockers</string> <string name="dns_content_blockers_info">When this feature is enabled it stops the device from contacting certain domains or websites known for distributing ads, malware, trackers and more.</string> <string name="dns_content_blockers_warning">This might cause issues on certain websites, services, and apps.</string> <string name="dns_content_blockers_custom_dns_warning">Attention: this setting cannot be used in combination with \"Use custom DNS server\".</string> @@ -359,7 +358,7 @@ <string name="feature_server_ip_override">Server IP override</string> <string name="feature_custom_mtu">MTU</string> <string name="feature_multihop">Multihop</string> - <string name="feature_dns_content_blockers">DNS content blockers</string> + <string name="dns_content_blockers">DNS content blockers</string> <string name="connection_details_ipv4">IPv4</string> <string name="connection_details_ipv6">IPv6</string> <string name="connection_details_in">In</string> |
