Merge branch 'change-ip-address-labels-to-uppercase-in-main-screen-dr…

…oid-1499'

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()
         }
     }

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,

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 = "<br/>"

android/lib/resource/src/main/res/values-da/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Tilsluttet</string>
     <string name="connecting_to_daemon">Opretter forbindelse til Mullvad-systemtjeneste...</string>
     <string name="connection_details_in">Ind</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Ud</string>
     <string name="continue_login">Fortsæt med login</string>
     <string name="copied_logs_to_clipboard">Kopierede logfiler til udklipsholder</string>
     <string name="copied_mullvad_account_number">Kopierede Mullvad-kontonummer til udklipsholder</string>

android/lib/resource/src/main/res/values-de/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Verbunden</string>
     <string name="connecting_to_daemon">Verbindung zum Mullvad-Systemdienst wird hergestellt...</string>
     <string name="connection_details_in">Eingehend</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Ausgehend</string>
     <string name="continue_login">Weiter mit Anmeldung</string>
     <string name="copied_logs_to_clipboard">Protokolle in Zwischenablage kopiert</string>
     <string name="copied_mullvad_account_number">Mullvad-Kontonummer wurde in die Zwischenablage kopiert</string>

android/lib/resource/src/main/res/values-es/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Conectado</string>
     <string name="connecting_to_daemon">Conectando al servicio del sistema Mullvad…</string>
     <string name="connection_details_in">Entrada</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Salida</string>
     <string name="continue_login">Iniciar sesión</string>
     <string name="copied_logs_to_clipboard">Registros copiados en el portapapeles</string>
     <string name="copied_mullvad_account_number">El número de cuenta de Mullvad se copió en el Portapapeles</string>

android/lib/resource/src/main/res/values-fi/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Yhdistetty</string>
     <string name="connecting_to_daemon">Yhdistetään Mullvad-järjestelmäpalveluun...</string>
     <string name="connection_details_in">Saapuva</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Lähtevä</string>
     <string name="continue_login">Jatka kirjautumista</string>
     <string name="copied_logs_to_clipboard">Lokit kopioitu leikepöydälle</string>
     <string name="copied_mullvad_account_number">Mullvad-tilin numero kopioitu leikepöydälle</string>

android/lib/resource/src/main/res/values-fr/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Connecté</string>
     <string name="connecting_to_daemon">Connexion au service système Mullvad...</string>
     <string name="connection_details_in">Entrante</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Sortante</string>
     <string name="continue_login">Continuer avec la connexion</string>
     <string name="copied_logs_to_clipboard">Journaux copiés dans le presse-papiers</string>
     <string name="copied_mullvad_account_number">Numéro de compte Mullvad copié dans le presse-papiers</string>

android/lib/resource/src/main/res/values-it/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Connesso</string>
     <string name="connecting_to_daemon">Connessione al servizio del sistema Mullvad...</string>
     <string name="connection_details_in">Ricezione</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Invio</string>
     <string name="continue_login">Continua con il login</string>
     <string name="copied_logs_to_clipboard">Log copiati negli appunti</string>
     <string name="copied_mullvad_account_number">Numero account di Mullvad copiato negli appunti</string>

android/lib/resource/src/main/res/values-ja/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">接続済み</string>
     <string name="connecting_to_daemon">Mullvad システムサービスに接続中...</string>
     <string name="connection_details_in">内側</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">外側</string>
     <string name="continue_login">ログインを続ける</string>
     <string name="copied_logs_to_clipboard">ログをクリップボードにコピーしました</string>
     <string name="copied_mullvad_account_number">Mullvadアカウント番号をクリップボードにコピーしました</string>

android/lib/resource/src/main/res/values-ko/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">연결됨</string>
     <string name="connecting_to_daemon">Mullvad 시스템 서비스에 연결하는 중...</string>
     <string name="connection_details_in">인</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">아웃</string>
     <string name="continue_login">로그인 계속하기</string>
     <string name="copied_logs_to_clipboard">로그를 클립보드에 복사했습니다.</string>
     <string name="copied_mullvad_account_number">클립보드에 Mullvad 계정 번호 복사됨</string>

android/lib/resource/src/main/res/values-my/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">ချိတ်ဆက်ပြီး</string>
     <string name="connecting_to_daemon">Mullvad စနစ် ဝန်ဆောင်မှုနှင့် ချိတ်ဆက်နေဆဲ...</string>
     <string name="connection_details_in">အဝင်</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">အထွက်</string>
     <string name="continue_login">ဆက်လက် ဝင်ရောက်ရန်</string>
     <string name="copied_logs_to_clipboard">ကလစ်ဘုတ်တွင် မှတ်တမ်းများ ကူးယူပြီး</string>
     <string name="copied_mullvad_account_number">Mullvad အကောင့်နံပါတ်ကို ကလစ်ဘုတ်တွင် ကူးထားပါသည်</string>

android/lib/resource/src/main/res/values-nb/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Tilkoblet</string>
     <string name="connecting_to_daemon">Kobler til Mullvads systemtjeneste ...</string>
     <string name="connection_details_in">Inngående</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Utgående</string>
     <string name="continue_login">Fortsett med pålogging</string>
     <string name="copied_logs_to_clipboard">Logger kopiert til utklippstavlen</string>
     <string name="copied_mullvad_account_number">Kopierte Mullvad-kontonummer til utklippstavlen</string>

android/lib/resource/src/main/res/values-nl/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Verbonden</string>
     <string name="connecting_to_daemon">Verbinden met Mullvad-systeemdienst...</string>
     <string name="connection_details_in">In</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Uit</string>
     <string name="continue_login">Doorgaan met aanmelden</string>
     <string name="copied_logs_to_clipboard">Logs gekopieerd naar klembord</string>
     <string name="copied_mullvad_account_number">Mullvad-accountnummer gekopieerd naar klembord</string>

android/lib/resource/src/main/res/values-pl/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Połączono</string>
     <string name="connecting_to_daemon">Łączenie z usługą systemową Mullvad...</string>
     <string name="connection_details_in">Wejście</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Wyjście</string>
     <string name="continue_login">Kontynuuj logowanie</string>
     <string name="copied_logs_to_clipboard">Skopiowano dzienniki do schowka</string>
     <string name="copied_mullvad_account_number">Skopiowano numer konta Mullvad do schowka</string>

android/lib/resource/src/main/res/values-pt/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Ligado</string>
     <string name="connecting_to_daemon">A ligar-se ao serviço de sistema Mulvad...</string>
     <string name="connection_details_in">Entrada</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Saída</string>
     <string name="continue_login">Continuar com a ligação</string>
     <string name="copied_logs_to_clipboard">Registos copiados para a área de transferência</string>
     <string name="copied_mullvad_account_number">Número de conta Mullvad copiado para a área de transferência</string>

android/lib/resource/src/main/res/values-ru/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Подключено</string>
     <string name="connecting_to_daemon">Подключение к системному сервису Mullvad...</string>
     <string name="connection_details_in">Вход</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Выход</string>
     <string name="continue_login">Войти</string>
     <string name="copied_logs_to_clipboard">Журналы скопированы в буфер обмена</string>
     <string name="copied_mullvad_account_number">Номер учетной записи Mullvad скопирован в буфер обмена</string>

android/lib/resource/src/main/res/values-sv/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Ansluten</string>
     <string name="connecting_to_daemon">Ansluter till Mullvads systemtjänst...</string>
     <string name="connection_details_in">In</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Ut</string>
     <string name="continue_login">Fortsätt med inloggning</string>
     <string name="copied_logs_to_clipboard">Loggarna har kopierats till urklipp</string>
     <string name="copied_mullvad_account_number">Kopierade Mullvad-kontonummer till urklipp</string>

android/lib/resource/src/main/res/values-th/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">เชื่อมต่อแล้ว</string>
     <string name="connecting_to_daemon">กำลังเชื่อมต่อบริการของระบบ Mullvad...</string>
     <string name="connection_details_in">เข้า</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">ออก</string>
     <string name="continue_login">เข้าสู่ระบบต่อ</string>
     <string name="copied_logs_to_clipboard">คัดลอกบันทึกล็อกไปยังคลิปบอร์ดแล้ว</string>
     <string name="copied_mullvad_account_number">คัดลอกหมายเลขบัญชี Mullvad ไปยังคลิปบอร์ดแล้ว</string>

android/lib/resource/src/main/res/values-tr/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">Bağlandı</string>
     <string name="connecting_to_daemon">Mullvad sistem hizmetlerine bağlanılıyor...</string>
     <string name="connection_details_in">Giriş</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">Çıkış</string>
     <string name="continue_login">Giriş yapmak için devam et</string>
     <string name="copied_logs_to_clipboard">Günlükler panoya kopyalandı</string>
     <string name="copied_mullvad_account_number">Mullvad hesap numarası panoya kopyalandı</string>

android/lib/resource/src/main/res/values-zh-rCN/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">已连接</string>
     <string name="connecting_to_daemon">正在连接到 Mullvad 系统服务…</string>
     <string name="connection_details_in">内部</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">外部</string>
     <string name="continue_login">继续登录</string>
     <string name="copied_logs_to_clipboard">已将日志复制到剪贴板</string>
     <string name="copied_mullvad_account_number">已将 Mullvad 帐号复制到剪贴板</string>

android/lib/resource/src/main/res/values-zh-rTW/strings.xml

@@ -70,6 +70,9 @@
     <string name="connected">已連線</string>
     <string name="connecting_to_daemon">連線 Mullvad 系統服務中...</string>
     <string name="connection_details_in">入境</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
+    <string name="connection_details_out">出境</string>
     <string name="continue_login">繼續登入</string>
     <string name="copied_logs_to_clipboard">已將記錄複製到剪貼簿</string>
     <string name="copied_mullvad_account_number">已將 Mullvad 帳號複製到剪貼簿</string>

android/lib/resource/src/main/res/values/strings.xml

@@ -378,8 +378,8 @@
     <string name="feature_custom_mtu">MTU</string>
     <string name="feature_daita">DAITA</string>
     <string name="feature_dns_content_blockers">DNS content blockers</string>
-    <string name="connection_details_out_ipv4">Out Ipv4</string>
-    <string name="connection_details_out_ipv6">Out Ipv6</string>
+    <string name="connection_details_ipv4">IPv4</string>
+    <string name="connection_details_ipv6">IPv6</string>
     <string name="connection_details_in">In</string>
     <string name="feature_indicators_show_more">%1$s more...</string>
     <string name="connect">Connect</string>
@@ -398,4 +398,5 @@
     <string name="local_network_sharing_info_block_connections_warning">Attention: If \"Block connections without VPN\" is enabled, \"Local network sharing\" will not work.</string>
     <string name="encrypted_dns_proxy_info_message_part1">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.</string>
     <string name="encrypted_dns_proxy_info_message_part2">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.</string>
+    <string name="connection_details_out">Out</string>
 </resources>

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 ""