summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2023-03-28 10:20:26 +0200
committerAlbin <albin@mullvad.net>2023-03-28 10:20:48 +0200
commitc4c8ccc73b9d107206d45e5ba9453492e6c2f5cb (patch)
tree3ce77e273ab0f5ef18a7f1bca9f572df3c44e798 /android
parentcea1adc5ee060c5f8052b44ffb706a1500001eb1 (diff)
downloadmullvadvpn-c4c8ccc73b9d107206d45e5ba9453492e6c2f5cb.tar.xz
mullvadvpn-c4c8ccc73b9d107206d45e5ba9453492e6c2f5cb.zip
Revert custom dns hint
Diffstat (limited to 'android')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt2
-rw-r--r--android/app/src/main/res/values-da/strings.xml1
-rw-r--r--android/app/src/main/res/values-de/strings.xml1
-rw-r--r--android/app/src/main/res/values-es/strings.xml1
-rw-r--r--android/app/src/main/res/values-fi/strings.xml1
-rw-r--r--android/app/src/main/res/values-fr/strings.xml1
-rw-r--r--android/app/src/main/res/values-it/strings.xml1
-rw-r--r--android/app/src/main/res/values-ja/strings.xml1
-rw-r--r--android/app/src/main/res/values-ko/strings.xml1
-rw-r--r--android/app/src/main/res/values-my/strings.xml1
-rw-r--r--android/app/src/main/res/values-nb/strings.xml1
-rw-r--r--android/app/src/main/res/values-nl/strings.xml1
-rw-r--r--android/app/src/main/res/values-pl/strings.xml1
-rw-r--r--android/app/src/main/res/values-pt/strings.xml1
-rw-r--r--android/app/src/main/res/values-ru/strings.xml1
-rw-r--r--android/app/src/main/res/values-sv/strings.xml1
-rw-r--r--android/app/src/main/res/values-th/strings.xml1
-rw-r--r--android/app/src/main/res/values-tr/strings.xml1
-rw-r--r--android/app/src/main/res/values-zh-rCN/strings.xml1
-rw-r--r--android/app/src/main/res/values-zh-rTW/strings.xml1
-rw-r--r--android/app/src/main/res/values/strings.xml1
21 files changed, 21 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
index 8fc2a8dc11..1f72107eed 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialog.kt
@@ -89,7 +89,7 @@ fun DnsDialog(
onFocusChanges = {},
onSubmit = { onAttemptToSave() },
isEnabled = true,
- placeholderText = stringResource(R.string.enter_value_placeholder),
+ placeholderText = stringResource(R.string.custom_dns_hint),
modifier =
Modifier.padding(top = midPadding)
.focusRequester(textFieldFocusRequester)
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 41e79658f5..c6d1953dbe 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">OPRETTER SIKKER FORBINDELSE</string>
<string name="critical_error">Kritisk fejl (som kræver din opmærksomhed)</string>
<string name="custom_dns_footer">Aktiver for at tilføje mindst én DNS-server.</string>
+ <string name="custom_dns_hint">Indtast IP</string>
<string name="custom_tunnel_host_resolution_error">Kunne ikke fortolke værtsnavnet på den tilpassede server</string>
<string name="device_inactive_description">Du har fjernet denne enhed. For at oprette forbindelse igen skal du logge ind igen.</string>
<string name="device_inactive_title">Enheden er inaktiv</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 072de1fe8a..76a1425fb1 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">SICHERE VERBINDUNG WIRD ERSTELLT</string>
<string name="critical_error">Kritischer Fehler (Ihre Aufmerksamkeit ist erforderlich)</string>
<string name="custom_dns_footer">Aktivieren, um mindestens einen DNS-Server hinzuzufügen.</string>
+ <string name="custom_dns_hint">IP eingeben</string>
<string name="custom_tunnel_host_resolution_error">Der Hostname des benutzerdefinierten Servers konnte nicht aufgelöst werden</string>
<string name="device_inactive_description">Sie haben dieses Gerät entfernt. Um sich erneut zu verbinden, müssen Sie sich erneut anmelden.</string>
<string name="device_inactive_title">Gerät ist inaktiv</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 52b5381c0d..8095b85289 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">CREANDO CONEXIÓN SEGURA</string>
<string name="critical_error">Error crítico (precisa su atención)</string>
<string name="custom_dns_footer">Active esta opción para agregar como mínimo un servidor DNS.</string>
+ <string name="custom_dns_hint">Escriba la IP</string>
<string name="custom_tunnel_host_resolution_error">No se puede resolver el nombre de host del servidor personalizado</string>
<string name="device_inactive_description">Ha quitado este dispositivo. Vuelva a iniciar la sesión para conectarse.</string>
<string name="device_inactive_title">El dispositivo está inactivo</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index fa4d54f1d7..fdf9a7ffb9 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">LUODAAN SUOJATTU YHTEYS</string>
<string name="critical_error">Vakava virhe (vaatii huomiotasi)</string>
<string name="custom_dns_footer">Ota käyttöön lisätäksesi vähintään yhden DNS-palvelimen.</string>
+ <string name="custom_dns_hint">Anna IP-osoite</string>
<string name="custom_tunnel_host_resolution_error">Mukautetun palvelimen isäntänimen selvittäminen epäonnistui</string>
<string name="device_inactive_description">Olet poistanut tämän laitteen. Jos haluat muodostaa yhteyden uudelleen, sinun täytyy kirjautua takaisin sisään.</string>
<string name="device_inactive_title">Laite ei ole aktiivinen</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 8c32c7ddc6..f501d2f5ce 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">CRÉATION D\'UNE CONNEXION SÉCURISÉE</string>
<string name="critical_error">Erreur critique (votre attention est requise)</string>
<string name="custom_dns_footer">Activez pour ajouter au moins un serveur DNS.</string>
+ <string name="custom_dns_hint">Saisir l\'IP</string>
<string name="custom_tunnel_host_resolution_error">Échec de la résolution du nom d\'hôte du serveur personnalisé</string>
<string name="device_inactive_description">Vous avez supprimé cet appareil. Vous devrez vous reconnecter pour connecter cet appareil à nouveau.</string>
<string name="device_inactive_title">L\'appareil est inactif</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index be38a145fe..82def46b78 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">CREAZIONE CONNESSIONE PROTETTA</string>
<string name="critical_error">Errore critico (è necessario intervenire)</string>
<string name="custom_dns_footer">Abilita per aggiungere almeno un server DNS.</string>
+ <string name="custom_dns_hint">Inserisci IP</string>
<string name="custom_tunnel_host_resolution_error">Impossibile risolvere il nome host del server personalizzato</string>
<string name="device_inactive_description">Hai rimosso questo dispositivo. Per riconnetterti, dovrai effettuare nuovamente il login.</string>
<string name="device_inactive_title">Il dispositivo è inattivo</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index d48abcd90a..eccdfa3610 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">セキュリティ保護接続を確立中</string>
<string name="critical_error">重大なエラー (ご注意ください)</string>
<string name="custom_dns_footer">1つ以上のDNSサーバーを追加するには有効にしてください。</string>
+ <string name="custom_dns_hint">IPを入力</string>
<string name="custom_tunnel_host_resolution_error">カスタムサーバーのホスト名を解決できませんでした</string>
<string name="device_inactive_description">このデバイスを削除しました。再度接続するには、ログインし直す必要があります。</string>
<string name="device_inactive_title">デバイスが無効です</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 4b76cc5175..a0defd153e 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">보안 연결 생성 중</string>
<string name="critical_error">심각한 오류(주의가 필요함)</string>
<string name="custom_dns_footer">하나 이상의 DNS 서버를 추가하려면 활성화합니다.</string>
+ <string name="custom_dns_hint">IP 입력</string>
<string name="custom_tunnel_host_resolution_error">사용자 지정 서버의 호스트 이름을 확인하지 못함</string>
<string name="device_inactive_description">이 장치를 제거했습니다. 다시 연결하려면 다시 로그인해야 합니다.</string>
<string name="device_inactive_title">장치가 비활성 상태입니다.</string>
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index 1feff0574f..84c51c424f 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">လုံခြုံသည့် ချိတ်ဆက်မှုကို ဖန်တီးနေပါသည်</string>
<string name="critical_error">အလွန်အရေးပါသည့် ချို့ယွင်းချက် (သင့်အာရုံစိုက်မှု လိုအပ်ပါသည်)</string>
<string name="custom_dns_footer">အနည်းဆုံး DNS ဆာဗာတစ်ခုကို ပေါင်းထည့်ပါ။</string>
+ <string name="custom_dns_hint">IP ဖြည့်ပါ</string>
<string name="custom_tunnel_host_resolution_error">စိတ်ကြိုက် ဆာဗာ၏ Hostname ကို ဖြေရှင်း၍ မရနိုင်ပါ</string>
<string name="device_inactive_description">ဤစက်ကို ဖယ်ရှားပြီး ဖြစ်သည်။ ထပ်မံချိတ်ဆက်ရန်အတွက် ပြန်လည် ဝင်ရောက်ရန် လိုပါသည်။</string>
<string name="device_inactive_title">စက်သည် သက်ဝင်လုပ်ဆောင်မှု မရှိပါ</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 07d6cbd657..5f136b7b55 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">OPPRETTER SIKKER TILKOBLING</string>
<string name="critical_error">Kritisk feil (krever din oppmerksomhet)</string>
<string name="custom_dns_footer">Aktiver for å legge til minst én DNS-server.</string>
+ <string name="custom_dns_hint">Angi IP</string>
<string name="custom_tunnel_host_resolution_error">Kunne ikke løse vertsnavnet til den egendefinerte serveren</string>
<string name="device_inactive_description">Du har fjernet denne enheten. For å koble til igjen, må du logge inn på nytt.</string>
<string name="device_inactive_title">Enheten er inaktiv</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index dda01f6c11..5089823a58 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">BEVEILIGDE VERBINDING AANMAKEN</string>
<string name="critical_error">Kritieke fout (uw aandacht is vereist)</string>
<string name="custom_dns_footer">Schakel in om minimaal één DNS-server toe te voegen.</string>
+ <string name="custom_dns_hint">Voer IP-adres in</string>
<string name="custom_tunnel_host_resolution_error">Kon de hostnaam van de aangepaste server niet omzetten</string>
<string name="device_inactive_description">U hebt dit apparaat verwijderd. U moet zich opnieuw aanmelden om het opnieuw te verbinden.</string>
<string name="device_inactive_title">Apparaat is niet actief</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 2e94cb447c..323e5f92c9 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">TWORZENIE BEZPIECZNEGO POŁĄCZENIA</string>
<string name="critical_error">Błąd krytyczny (wymagana uwaga)</string>
<string name="custom_dns_footer">Włącz, aby dodać co najmniej jeden serwer DNS.</string>
+ <string name="custom_dns_hint">Wprowadź adres IP</string>
<string name="custom_tunnel_host_resolution_error">Nie można rozpoznać nazwy hosta serwera niestandardowego</string>
<string name="device_inactive_description">Urządzenie usunięto. Aby połączyć się ponownie, musisz się ponownie zalogować.</string>
<string name="device_inactive_title">Urządzenie nieaktywne</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 50f688114a..9bf0c8a942 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">A CRIAR LIGAÇÃO SEGURA</string>
<string name="critical_error">Erro crítico (é necessária a sua atenção)</string>
<string name="custom_dns_footer">Ativar para adicionar pelo menos um servidor DNS.</string>
+ <string name="custom_dns_hint">Introduzir IP</string>
<string name="custom_tunnel_host_resolution_error">Não foi possível resolver o nome do anfitrião do servidor personalizado</string>
<string name="device_inactive_description">Removeu este dispositivo. Para voltar a ligar o dispositivo, terá de voltar a iniciar a sessão.</string>
<string name="device_inactive_title">O dispositivo está desativado</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 2431264cd9..1d5da1695c 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">СОЗДАНИЕ ЗАЩИЩЕННОГО ПОДКЛЮЧЕНИЯ</string>
<string name="critical_error">Критическая ошибка (требуется ваше участие)</string>
<string name="custom_dns_footer">Чтобы добавить как минимум один DNS-сервер, включите этот параметр.</string>
+ <string name="custom_dns_hint">Введите IP-адрес</string>
<string name="custom_tunnel_host_resolution_error">Не удалось преобразовать имя узла пользовательского сервера</string>
<string name="device_inactive_description">Вы удалили это устройство. Чтобы снова подключиться, нужно будет выполнить вход.</string>
<string name="device_inactive_title">Устройство неактивно</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index f132492fb0..30cd54d409 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">SKAPAR SÄKER ANSLUTNING</string>
<string name="critical_error">Kritiskt fel (kräver din uppmärksamhet)</string>
<string name="custom_dns_footer">Aktivera för att lägga till minst en DNS-server.</string>
+ <string name="custom_dns_hint">Ange IP</string>
<string name="custom_tunnel_host_resolution_error">Det gick inte att lösa värdnamnet för den anpassade servern</string>
<string name="device_inactive_description">Du har tagit bort den här enheten. Du måste logga in igen för att återansluta.</string>
<string name="device_inactive_title">Enheten är inaktiv</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index c3e826cc5e..a4759648f3 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">กำลังสร้างการเชื่อมต่อที่ปลอดภัย</string>
<string name="critical_error">ข้อผิดพลาดร้ายแรง (คุณจำเป็นต้องตรวจสอบ)</string>
<string name="custom_dns_footer">เปิดเพื่อเพิ่มเซิร์ฟเวอร์ DNS อย่างน้อยหนึ่งรายการ</string>
+ <string name="custom_dns_hint">ป้อน IP</string>
<string name="custom_tunnel_host_resolution_error">ไม่พบชื่อโฮสต์ของเซิร์ฟเวอร์แบบกำหนดเอง</string>
<string name="device_inactive_description">คุณได้ลบอุปกรณ์เครื่องนี้แล้ว หากต้องการเชื่อมต่ออีกครั้ง คุณจะต้องเข้าสู่ระบบใหม่อีกครั้ง</string>
<string name="device_inactive_title">อุปกรณ์ไม่ได้ใช้งาน</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 7acbbed720..7fb6438320 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">GÜVENLİ BAĞLANTI OLUŞTURULUYOR</string>
<string name="critical_error">Kritik hata (Lütfen dikkatli olun)</string>
<string name="custom_dns_footer">En az bir DNS sunucusu eklemek için etkinleştirin.</string>
+ <string name="custom_dns_hint">IP\'yi girin</string>
<string name="custom_tunnel_host_resolution_error">Özel sunucu ana bilgisayar adı çözülemiyor</string>
<string name="device_inactive_description">Bu cihazı kaldırdın. Tekrar bağlanmak için yeniden giriş yapmanız gerekecek.</string>
<string name="device_inactive_title">Cihaz etkin değil</string>
diff --git a/android/app/src/main/res/values-zh-rCN/strings.xml b/android/app/src/main/res/values-zh-rCN/strings.xml
index 16394cc3fb..9c5f98c8e1 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">正在创建安全连接</string>
<string name="critical_error">严重错误(需要注意)</string>
<string name="custom_dns_footer">启用以添加至少一个 DNS 服务器。</string>
+ <string name="custom_dns_hint">输入 IP</string>
<string name="custom_tunnel_host_resolution_error">无法解析自定义服务器的主机名</string>
<string name="device_inactive_description">您已移除此设备。要重新连接,您需要重新登录。</string>
<string name="device_inactive_title">设备处于非活动状态</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 6e32faf157..02056bee04 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -42,6 +42,7 @@
<string name="creating_secure_connection">建立安全連線</string>
<string name="critical_error">嚴重錯誤 (需注意)</string>
<string name="custom_dns_footer">啟用以新增至少一個 DNS 伺服器。</string>
+ <string name="custom_dns_hint">輸入 IP</string>
<string name="custom_tunnel_host_resolution_error">無法解析自訂伺服器的主機名稱</string>
<string name="device_inactive_description">您已移除此裝置。若要重新連線,您需要重新登入。</string>
<string name="device_inactive_title">裝置處於非活動狀態</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index bce6426629..747c3ee31e 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -126,6 +126,7 @@
settings</string>
<string name="no_wireguard_key">Valid WireGuard key is missing. Manage keys under Advanced
settings.</string>
+ <string name="custom_dns_hint">Enter IP</string>
<string name="custom_tunnel_host_resolution_error">Failed to resolve the hostname of custom
server</string>
<string name="is_offline">This device is offline, no tunnels can be established</string>