diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
index 05862a5bc49e..1c3342086354 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreenTest.kt
@@ -518,10 +518,10 @@ class ConnectScreenTest {
onNodeWithText("In").assertExists()
onNodeWithText("$inHost:$inPort UDP").assertExists()
- onNodeWithText("Out Ipv4").assertExists()
+ onNodeWithText("Out IPv4").assertExists()
onNodeWithText(outIpv4).assertExists()
- onNodeWithText("Out Ipv6").assertExists()
+ onNodeWithText("Out IPv6").assertExists()
onNodeWithText(outIpv6).assertExists()
}
}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt
index 5feffc83a9a9..3ec353bc960f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/connectioninfo/ConnectionDetailPanel.kt
@@ -17,6 +17,7 @@ import androidx.constraintlayout.compose.Dimension
import net.mullvad.mullvadvpn.R
import net.mullvad.mullvadvpn.compose.screen.ConnectionDetails
import net.mullvad.mullvadvpn.compose.test.LOCATION_INFO_CONNECTION_OUT_TEST_TAG
+import net.mullvad.mullvadvpn.constant.SPACE_CHAR
import net.mullvad.mullvadvpn.lib.model.TransportProtocol
import net.mullvad.mullvadvpn.lib.model.TunnelEndpoint
import net.mullvad.mullvadvpn.lib.theme.Dimens
@@ -99,7 +100,12 @@ fun ConnectionDetails(
if (outIPV4 != null) {
Text(
- text = stringResource(R.string.connection_details_out_ipv4),
+ text =
+ buildString {
+ append(stringResource(R.string.connection_details_out))
+ append(SPACE_CHAR)
+ append(stringResource(R.string.connection_details_ipv4))
+ },
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
maxLines = 1,
@@ -139,7 +145,12 @@ fun ConnectionDetails(
if (outIPV6 != null) {
Text(
- text = stringResource(R.string.connection_details_out_ipv6),
+ text =
+ buildString {
+ append(stringResource(R.string.connection_details_out))
+ append(SPACE_CHAR)
+ append(stringResource(R.string.connection_details_ipv6))
+ },
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.bodySmall,
maxLines = 1,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt
index 23f4189feb78..90e6897be06e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/constant/StringConstant.kt
@@ -1,5 +1,6 @@
package net.mullvad.mullvadvpn.constant
const val EMPTY_STRING = ""
+const val SPACE_CHAR = ' '
const val NEWLINE_STRING = "\n"
const val HTML_NEWLINE_STRING = "
"
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 e31c562f7c2f..890ae1b0bc48 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -70,6 +70,9 @@
Tilsluttet
Opretter forbindelse til Mullvad-systemtjeneste...
Ind
+ IPv4
+ IPv6
+ Ud
Fortsæt med login
Kopierede logfiler til udklipsholder
Kopierede Mullvad-kontonummer til udklipsholder
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 924e0c7c3933..c992536bb2f7 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -70,6 +70,9 @@
Verbunden
Verbindung zum Mullvad-Systemdienst wird hergestellt...
Eingehend
+ IPv4
+ IPv6
+ Ausgehend
Weiter mit Anmeldung
Protokolle in Zwischenablage kopiert
Mullvad-Kontonummer wurde in die Zwischenablage kopiert
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 05326a5c2ea0..984c3d21cd5b 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -70,6 +70,9 @@
Conectado
Conectando al servicio del sistema Mullvad…
Entrada
+ IPv4
+ IPv6
+ Salida
Iniciar sesión
Registros copiados en el portapapeles
El número de cuenta de Mullvad se copió en el Portapapeles
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 0a7a85574a35..09069d2b8b72 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -70,6 +70,9 @@
Yhdistetty
Yhdistetään Mullvad-järjestelmäpalveluun...
Saapuva
+ IPv4
+ IPv6
+ Lähtevä
Jatka kirjautumista
Lokit kopioitu leikepöydälle
Mullvad-tilin numero kopioitu leikepöydälle
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 b92e0552cceb..d5245f8d515e 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -70,6 +70,9 @@
Connecté
Connexion au service système Mullvad...
Entrante
+ IPv4
+ IPv6
+ Sortante
Continuer avec la connexion
Journaux copiés dans le presse-papiers
Numéro de compte Mullvad copié dans le presse-papiers
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 a7e8659f1fe7..55ac2960dc78 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -70,6 +70,9 @@
Connesso
Connessione al servizio del sistema Mullvad...
Ricezione
+ IPv4
+ IPv6
+ Invio
Continua con il login
Log copiati negli appunti
Numero account di Mullvad copiato negli appunti
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 cb29e5438b49..dd11e1b2729e 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -70,6 +70,9 @@
接続済み
Mullvad システムサービスに接続中...
内側
+ IPv4
+ IPv6
+ 外側
ログインを続ける
ログをクリップボードにコピーしました
Mullvadアカウント番号をクリップボードにコピーしました
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 7fbcead82f42..7b1d4f9f9f55 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -70,6 +70,9 @@
연결됨
Mullvad 시스템 서비스에 연결하는 중...
인
+ IPv4
+ IPv6
+ 아웃
로그인 계속하기
로그를 클립보드에 복사했습니다.
클립보드에 Mullvad 계정 번호 복사됨
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 7c67331288a4..7b3ff221eba2 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -70,6 +70,9 @@
ချိတ်ဆက်ပြီး
Mullvad စနစ် ဝန်ဆောင်မှုနှင့် ချိတ်ဆက်နေဆဲ...
အဝင်
+ IPv4
+ IPv6
+ အထွက်
ဆက်လက် ဝင်ရောက်ရန်
ကလစ်ဘုတ်တွင် မှတ်တမ်းများ ကူးယူပြီး
Mullvad အကောင့်နံပါတ်ကို ကလစ်ဘုတ်တွင် ကူးထားပါသည်
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 63cc60b4eecb..600930f1a289 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -70,6 +70,9 @@
Tilkoblet
Kobler til Mullvads systemtjeneste ...
Inngående
+ IPv4
+ IPv6
+ Utgående
Fortsett med pålogging
Logger kopiert til utklippstavlen
Kopierte Mullvad-kontonummer til utklippstavlen
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 e1e5fad9bafd..4db93cec36ef 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -70,6 +70,9 @@
Verbonden
Verbinden met Mullvad-systeemdienst...
In
+ IPv4
+ IPv6
+ Uit
Doorgaan met aanmelden
Logs gekopieerd naar klembord
Mullvad-accountnummer gekopieerd naar klembord
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 c48d912cab3e..080564c51ed3 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -70,6 +70,9 @@
Połączono
Łączenie z usługą systemową Mullvad...
Wejście
+ IPv4
+ IPv6
+ Wyjście
Kontynuuj logowanie
Skopiowano dzienniki do schowka
Skopiowano numer konta Mullvad do schowka
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 a5e673badd3c..d3d230a5bab0 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -70,6 +70,9 @@
Ligado
A ligar-se ao serviço de sistema Mulvad...
Entrada
+ IPv4
+ IPv6
+ Saída
Continuar com a ligação
Registos copiados para a área de transferência
Número de conta Mullvad copiado para a área de transferência
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 7fe08a43161d..6f59122aa745 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -70,6 +70,9 @@
Подключено
Подключение к системному сервису Mullvad...
Вход
+ IPv4
+ IPv6
+ Выход
Войти
Журналы скопированы в буфер обмена
Номер учетной записи Mullvad скопирован в буфер обмена
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 27e961505cd7..f3d185c5f965 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -70,6 +70,9 @@
Ansluten
Ansluter till Mullvads systemtjänst...
In
+ IPv4
+ IPv6
+ Ut
Fortsätt med inloggning
Loggarna har kopierats till urklipp
Kopierade Mullvad-kontonummer till urklipp
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 7aa7946789ca..3ceee70558fb 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -70,6 +70,9 @@
เชื่อมต่อแล้ว
กำลังเชื่อมต่อบริการของระบบ Mullvad...
เข้า
+ IPv4
+ IPv6
+ ออก
เข้าสู่ระบบต่อ
คัดลอกบันทึกล็อกไปยังคลิปบอร์ดแล้ว
คัดลอกหมายเลขบัญชี Mullvad ไปยังคลิปบอร์ดแล้ว
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 5a0a0c6c6046..296346242f8b 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -70,6 +70,9 @@
Bağlandı
Mullvad sistem hizmetlerine bağlanılıyor...
Giriş
+ IPv4
+ IPv6
+ Çıkış
Giriş yapmak için devam et
Günlükler panoya kopyalandı
Mullvad hesap numarası panoya kopyalandı
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 9187abe774af..82921a500160 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
@@ -70,6 +70,9 @@
已连接
正在连接到 Mullvad 系统服务…
内部
+ IPv4
+ IPv6
+ 外部
继续登录
已将日志复制到剪贴板
已将 Mullvad 帐号复制到剪贴板
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 e8b4733bd2cb..cb0085a0152f 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
@@ -70,6 +70,9 @@
已連線
連線 Mullvad 系統服務中...
入境
+ IPv4
+ IPv6
+ 出境
繼續登入
已將記錄複製到剪貼簿
已將 Mullvad 帳號複製到剪貼簿
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index aea61113ad8f..b89488bc1ae9 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -378,8 +378,8 @@
MTU
DAITA
DNS content blockers
- Out Ipv4
- Out Ipv6
+ IPv4
+ IPv6
In
%1$s more...
Connect
@@ -398,4 +398,5 @@
Attention: If \"Block connections without VPN\" is enabled, \"Local network sharing\" will not work.
With the “Encrypted DNS proxy” method, the app will communicate with our Mullvad API through a proxy address. It does this by retrieving an address from a DNS over HTTPS (DoH) server and then using that to reach our API servers.
If you are not connected to our VPN, then the Encrypted DNS proxy will use your own non-VPN IP when connecting. The DoH servers are hosted by one of the following providers: Quad 9, CloudFlare, or Google.
+ Out
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index 4d588a5a9eda..c197070d53d0 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -2512,12 +2512,6 @@ msgstr ""
msgid "Not found"
msgstr ""
-msgid "Out Ipv4"
-msgstr ""
-
-msgid "Out Ipv6"
-msgstr ""
-
msgid "Overrides active"
msgstr ""