From aae0421c53e96ce584950d3de6ee5374b09d0210 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 1 Jul 2024 15:58:23 +0200 Subject: [PATCH 1/2] Remove update available message --- .../compose/screen/ConnectScreenTest.kt | 48 +------------------ .../compose/screen/SettingsScreenTest.kt | 4 +- .../compose/cell/NavigationComposeCell.kt | 3 +- .../notificationbanner/NotificationBanner.kt | 7 +-- .../notificationbanner/NotificationData.kt | 13 ----- .../compose/screen/SettingsScreen.kt | 8 ++-- .../compose/state/SettingsUiState.kt | 2 +- .../repository/InAppNotificationController.kt | 5 -- .../net/mullvad/mullvadvpn/ui/VersionInfo.kt | 8 +--- .../AppVersionInfoRepository.kt | 6 +-- .../usecase/VersionNotificationUseCase.kt | 17 +------ .../mullvadvpn/viewmodel/SettingsViewModel.kt | 7 ++- .../InAppNotificationControllerTest.kt | 4 +- .../usecase/VersionNotificationUseCaseTest.kt | 28 +---------- .../viewmodel/SettingsViewModelTest.kt | 39 +++------------ .../resource/src/main/res/values/strings.xml | 2 - 16 files changed, 26 insertions(+), 175 deletions(-) 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 98c87114fbaa..9ba5db81bcaa 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 @@ -597,50 +597,11 @@ class ConnectScreenTest { } } - @Test - fun testOutdatedVersionNotification() { - composeExtension.use { - // Arrange - val versionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = true, - suggestedUpgradeVersion = "1.1" - ) - setContentWithTheme { - ConnectScreen( - state = - ConnectUiState( - location = null, - selectedRelayItemTitle = null, - tunnelState = TunnelState.Connecting(null, null), - inAddress = null, - outAddress = "", - showLocation = false, - deviceName = "", - daysLeftUntilExpiry = null, - inAppNotification = InAppNotification.UpdateAvailable(versionInfo), - isPlayBuild = false - ), - ) - } - - // Assert - onNodeWithText("UPDATE AVAILABLE").assertExists() - onNodeWithText("Install Mullvad VPN (1.1) to stay up to date").assertExists() - } - } - @Test fun testUnsupportedVersionNotification() { composeExtension.use { // Arrange - val versionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = false, - suggestedUpgradeVersion = "1.1" - ) + val versionInfo = VersionInfo(currentVersion = "1.0", isSupported = false) setContentWithTheme { ConnectScreen( state = @@ -702,12 +663,7 @@ class ConnectScreenTest { composeExtension.use { // Arrange val mockedClickHandler: () -> Unit = mockk(relaxed = true) - val versionInfo = - VersionInfo( - isSupported = false, - currentVersion = "", - suggestedUpgradeVersion = "1.1" - ) + val versionInfo = VersionInfo(isSupported = false, currentVersion = "") setContentWithTheme { ConnectScreen( onUpdateVersionClick = mockedClickHandler, diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt index afa144f405a3..469fb629a4b7 100644 --- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt +++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt @@ -31,7 +31,7 @@ class SettingsScreenTest { SettingsUiState( appVersion = "", isLoggedIn = true, - isUpdateAvailable = true, + isSupportedVersion = true, isPlayBuild = false ), ) @@ -54,7 +54,7 @@ class SettingsScreenTest { SettingsUiState( appVersion = "", isLoggedIn = false, - isUpdateAvailable = true, + isSupportedVersion = true, isPlayBuild = false ), ) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt index fdc01ab62d59..a0dfe44f0930 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/NavigationComposeCell.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import net.mullvad.mullvadvpn.R @@ -95,7 +94,7 @@ internal fun NavigationTitleView( Image( painter = painterResource(id = R.drawable.icon_alert), modifier = Modifier.padding(end = Dimens.smallPadding), - contentDescription = stringResource(id = R.string.update_available) + contentDescription = null ) } Text( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt index c5600b92a2c7..5a10e005a598 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationBanner.kt @@ -50,12 +50,7 @@ private fun PreviewNotificationBanner() { val bannerDataList = listOf( InAppNotification.UnsupportedVersion( - versionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = false, - suggestedUpgradeVersion = null - ), + versionInfo = VersionInfo(currentVersion = "1.0", isSupported = false), ), InAppNotification.AccountExpiry(expiry = DateTime.now()), InAppNotification.TunnelStateBlocked, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt index b8ea96fc72a3..28efcee9c437 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/notificationbanner/NotificationData.kt @@ -93,19 +93,6 @@ fun InAppNotification.toNotificationData( if (isPlayBuild) null else NotificationAction(R.drawable.icon_extlink, onClickUpdateVersion) ) - is InAppNotification.UpdateAvailable -> - NotificationData( - title = stringResource(id = R.string.update_available), - message = - stringResource( - id = R.string.update_available_description, - versionInfo.suggestedUpgradeVersion ?: "" - ), - statusLevel = StatusLevel.Warning, - action = - if (isPlayBuild) null - else NotificationAction(R.drawable.icon_extlink, onClickUpdateVersion) - ) } @Composable diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt index 15852560c130..c602d731f2ed 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt @@ -54,7 +54,7 @@ private fun PreviewSettings() { SettingsUiState( appVersion = "2222.22", isLoggedIn = true, - isUpdateAvailable = true, + isSupportedVersion = true, isPlayBuild = false ), ) @@ -172,13 +172,13 @@ private fun AppVersion(context: Context, state: SettingsUiState) { ) } }, - showWarning = state.isUpdateAvailable, + showWarning = !state.isSupportedVersion, isRowEnabled = !state.isPlayBuild ) - if (state.isUpdateAvailable) { + if (!state.isSupportedVersion) { Text( - text = stringResource(id = R.string.update_available_footer), + text = stringResource(id = R.string.unsupported_version_description), style = MaterialTheme.typography.labelMedium, color = MaterialTheme.colorScheme.onSecondary, modifier = diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt index b325ed2ce735..8f5ce2d8a221 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt @@ -3,6 +3,6 @@ package net.mullvad.mullvadvpn.compose.state data class SettingsUiState( val appVersion: String, val isLoggedIn: Boolean, - val isUpdateAvailable: Boolean, + val isSupportedVersion: Boolean, val isPlayBuild: Boolean ) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt index 79db20d39011..6686621f7b65 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/InAppNotificationController.kt @@ -47,11 +47,6 @@ sealed class InAppNotification { override val statusLevel = StatusLevel.Info override val priority: Long = 1001 } - - data class UpdateAvailable(val versionInfo: VersionInfo) : InAppNotification() { - override val statusLevel = StatusLevel.Info - override val priority: Long = 1000 - } } class InAppNotificationController( diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt index c0ab7dd0ed00..7e2550974dea 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/VersionInfo.kt @@ -1,9 +1,3 @@ package net.mullvad.mullvadvpn.ui -data class VersionInfo( - val currentVersion: String, - val isSupported: Boolean, - val suggestedUpgradeVersion: String? -) { - val isUpdateAvailable: Boolean = suggestedUpgradeVersion != null -} +data class VersionInfo(val currentVersion: String, val isSupported: Boolean) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoRepository.kt index 74b67348b323..63ce64cd06a8 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoRepository.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AppVersionInfoRepository.kt @@ -12,10 +12,6 @@ class AppVersionInfoRepository( ) { fun versionInfo(): Flow = managementService.versionInfo.map { appVersionInfo -> - VersionInfo( - currentVersion = buildVersion.name, - isSupported = appVersionInfo.supported, - suggestedUpgradeVersion = appVersionInfo.suggestedUpgrade, - ) + VersionInfo(currentVersion = buildVersion.name, isSupported = appVersionInfo.supported) } } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCase.kt index 43f1fdac7716..18d4e2fc3e21 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCase.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCase.kt @@ -14,24 +14,9 @@ class VersionNotificationUseCase( operator fun invoke() = appVersionInfoRepository .versionInfo() - .map { versionInfo -> - listOfNotNull( - unsupportedVersionNotification(versionInfo), - updateAvailableNotification(versionInfo) - ) - } + .map { versionInfo -> listOfNotNull(unsupportedVersionNotification(versionInfo)) } .distinctUntilChanged() - private fun updateAvailableNotification(versionInfo: VersionInfo): InAppNotification? { - if (!isVersionInfoNotificationEnabled) { - return null - } - - return if (versionInfo.isUpdateAvailable) { - InAppNotification.UpdateAvailable(versionInfo) - } else null - } - private fun unsupportedVersionNotification(versionInfo: VersionInfo): InAppNotification? { if (!isVersionInfoNotificationEnabled) { return null diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt index 5150af274786..21870d99b20f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt @@ -24,8 +24,7 @@ class SettingsViewModel( SettingsUiState( isLoggedIn = deviceState is DeviceState.LoggedIn, appVersion = versionInfo.currentVersion, - isUpdateAvailable = - versionInfo.let { it.isSupported.not() || it.isUpdateAvailable }, + isSupportedVersion = versionInfo.isSupported, isPlayBuild = isPlayBuild ) } @@ -35,7 +34,7 @@ class SettingsViewModel( SettingsUiState( appVersion = "", isLoggedIn = false, - isUpdateAvailable = false, + isSupportedVersion = true, isPlayBuild ) ) @@ -47,7 +46,7 @@ class SettingsViewModel( SettingsUiState( appVersion = "", isLoggedIn = false, - isUpdateAvailable = false, + isSupportedVersion = true, isPlayBuild ) ) diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt index 91749b468e93..78f1563c852b 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/InAppNotificationControllerTest.kt @@ -77,8 +77,7 @@ class InAppNotificationControllerTest { tunnelStateNotifications.value = listOf(tunnelStateBlocked, tunnelStateError) val unsupportedVersion = InAppNotification.UnsupportedVersion(mockk()) - val updateAvailable = InAppNotification.UpdateAvailable(mockk()) - versionNotifications.value = listOf(unsupportedVersion, updateAvailable) + versionNotifications.value = listOf(unsupportedVersion) val accountExpiry = InAppNotification.AccountExpiry(DateTime.now()) accountExpiryNotifications.value = listOf(accountExpiry) @@ -93,7 +92,6 @@ class InAppNotificationControllerTest { unsupportedVersion, accountExpiry, newDevice, - updateAvailable, ), notifications ) diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt index 9d40f9715ce0..944ebc11a4a8 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/usecase/VersionNotificationUseCaseTest.kt @@ -23,10 +23,7 @@ class VersionNotificationUseCaseTest { private val mockAppVersionInfoRepository: AppVersionInfoRepository = mockk() - private val versionInfo = - MutableStateFlow( - VersionInfo(currentVersion = "", isSupported = true, suggestedUpgradeVersion = null) - ) + private val versionInfo = MutableStateFlow(VersionInfo(currentVersion = "", isSupported = true)) private lateinit var versionNotificationUseCase: VersionNotificationUseCase @BeforeEach @@ -52,28 +49,6 @@ class VersionNotificationUseCaseTest { versionNotificationUseCase().test { assertTrue { awaitItem().isEmpty() } } } - @Test - fun `when a new version is available use case should emit UpdateAvailable with new version`() = - runTest { - versionNotificationUseCase().test { - // Arrange, Act - val upgradeVersionInfo = - VersionInfo( - currentVersion = "1.0", - isSupported = true, - suggestedUpgradeVersion = "1.1" - ) - awaitItem() - versionInfo.value = upgradeVersionInfo - - // Assert - assertEquals( - awaitItem(), - listOf(InAppNotification.UpdateAvailable(upgradeVersionInfo)) - ) - } - } - @Test fun `when an unsupported version use case should emit UnsupportedVersion notification`() = runTest { @@ -83,7 +58,6 @@ class VersionNotificationUseCaseTest { VersionInfo( currentVersion = "1.0", isSupported = false, - suggestedUpgradeVersion = null ) awaitItem() versionInfo.value = upgradeVersionInfo diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt index c76e2cd2787f..416dd7c1a9af 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModelTest.kt @@ -26,9 +26,7 @@ class SettingsViewModelTest { private val mockAppVersionInfoRepository: AppVersionInfoRepository = mockk() private val versionInfo = - MutableStateFlow( - VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = null) - ) + MutableStateFlow(VersionInfo(currentVersion = "", isSupported = false)) private lateinit var viewModel: SettingsViewModel @@ -60,53 +58,30 @@ class SettingsViewModelTest { } @Test - fun `when AppVersionInfoCache returns isOutdated false uiState should return isUpdateAvailable false`() = + fun `when AppVersionInfoRepository returns isSupported true uiState should return isSupportedVersion true`() = runTest { // Arrange - val versionInfoTestItem = - VersionInfo( - currentVersion = "1.0", - isSupported = true, - suggestedUpgradeVersion = null - ) - - // Act, Assert - viewModel.uiState.test { - awaitItem() // Wait for initial value - - versionInfo.value = versionInfoTestItem - val result = awaitItem() - assertEquals(false, result.isUpdateAvailable) - } - } - - @Test - fun `when AppVersionInfoCache returns isSupported false uiState should return isUpdateAvailable true`() = - runTest { - // Arrange - val versionInfoTestItem = - VersionInfo(currentVersion = "", isSupported = false, suggestedUpgradeVersion = "") + val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = true) versionInfo.value = versionInfoTestItem // Act, Assert viewModel.uiState.test { val result = awaitItem() - assertEquals(true, result.isUpdateAvailable) + assertEquals(true, result.isSupportedVersion) } } @Test - fun `when AppVersionInfoCache returns isOutdated true uiState should return isUpdateAvailable true`() = + fun `when AppVersionInfoRepository returns isSupported false uiState should return isSupportedVersion false`() = runTest { // Arrange - val versionInfoTestItem = - VersionInfo(currentVersion = "", isSupported = true, suggestedUpgradeVersion = "") + val versionInfoTestItem = VersionInfo(currentVersion = "", isSupported = false) versionInfo.value = versionInfoTestItem // Act, Assert viewModel.uiState.test { val result = awaitItem() - assertEquals(true, result.isUpdateAvailable) + assertEquals(false, result.isSupportedVersion) } } } diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml index f7fafc72ffcb..367b635879de 100644 --- a/android/lib/resource/src/main/res/values/strings.xml +++ b/android/lib/resource/src/main/res/values/strings.xml @@ -145,8 +145,6 @@ Unable to resolve host of custom tunnel. Try changing your settings. Your device is offline. The tunnel will automatically connect once your device is back online. Virtual adapter error - UPDATE AVAILABLE - Install Mullvad VPN (%1$s) to stay up to date UNSUPPORTED VERSION Your privacy might be at risk with this unsupported app version. Please update now. You are running an unsupported app version. From a6d23d483fd16a8be34a6cc24cd8222f9757eef2 Mon Sep 17 00:00:00 2001 From: Albin Date: Mon, 1 Jul 2024 23:23:41 +0200 Subject: [PATCH 2/2] Update translations --- android/lib/resource/src/main/res/values-da/strings.xml | 2 -- android/lib/resource/src/main/res/values-de/strings.xml | 2 -- android/lib/resource/src/main/res/values-es/strings.xml | 2 -- android/lib/resource/src/main/res/values-fi/strings.xml | 2 -- android/lib/resource/src/main/res/values-fr/strings.xml | 2 -- android/lib/resource/src/main/res/values-it/strings.xml | 2 -- android/lib/resource/src/main/res/values-ja/strings.xml | 2 -- android/lib/resource/src/main/res/values-ko/strings.xml | 2 -- android/lib/resource/src/main/res/values-my/strings.xml | 2 -- android/lib/resource/src/main/res/values-nb/strings.xml | 2 -- android/lib/resource/src/main/res/values-nl/strings.xml | 2 -- android/lib/resource/src/main/res/values-pl/strings.xml | 2 -- android/lib/resource/src/main/res/values-pt/strings.xml | 2 -- android/lib/resource/src/main/res/values-ru/strings.xml | 2 -- android/lib/resource/src/main/res/values-sv/strings.xml | 2 -- android/lib/resource/src/main/res/values-th/strings.xml | 2 -- android/lib/resource/src/main/res/values-tr/strings.xml | 2 -- android/lib/resource/src/main/res/values-zh-rCN/strings.xml | 2 -- android/lib/resource/src/main/res/values-zh-rTW/strings.xml | 2 -- gui/locales/messages.pot | 3 --- 20 files changed, 41 deletions(-) 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 1649379f6e1c..fce34db4d827 100644 --- a/android/lib/resource/src/main/res/values-da/strings.xml +++ b/android/lib/resource/src/main/res/values-da/strings.xml @@ -333,8 +333,6 @@ IKKE-UNDERSTØTTET VERSION Dit privatliv kan være i fare med denne ikke-understøttede appversion. Opdater den straks. Du kører en ikke-understøttet appversion. - OPDATERING TILGÆNGELIG - Installer Mullvad VPN (%1$s) for at holde dig opdateret Opdatering tilgængelig, download den for at forblive sikker. Opdater DNS-server Opdater listenavn 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 25ae2251a0e8..66b4d5f2fc1f 100644 --- a/android/lib/resource/src/main/res/values-de/strings.xml +++ b/android/lib/resource/src/main/res/values-de/strings.xml @@ -333,8 +333,6 @@ NICHT UNTERSTÜTZTE VERSION Ihre Privatsphäre könnte mit dieser nicht unterstützen Version der App gefährdet sein. Bitte aktualisieren Sie sie. Sie verwenden eine nicht unterstützte Version der App. - UPDATE VERFÜGBAR - Installieren Sie Mullvad VPN (%1$s), um auf dem neuesten Stand zu bleiben Update verfügbar, laden Sie es herunter, um sicher zu bleiben. DNS-Server aktualisieren Name der Liste ändern 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 0dd47afb3d69..9699706e89fd 100644 --- a/android/lib/resource/src/main/res/values-es/strings.xml +++ b/android/lib/resource/src/main/res/values-es/strings.xml @@ -333,8 +333,6 @@ VERSIÓN NO ADMITIDA Al usar esta versión obsoleta de la aplicación, es posible que su privacidad esté en riesgo. Actualice ahora. Ejecuta una versión de la aplicación que no es compatible. - ACTUALIZACIÓN DISPONIBLE - Instale Mullvad VPN (%1$s) para seguir actualizado Hay una actualización disponible, descárguela para seguir protegido. Actualizar servidor DNS Actualizar nombre de la lista 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 78a92d080e46..82baf522c94a 100644 --- a/android/lib/resource/src/main/res/values-fi/strings.xml +++ b/android/lib/resource/src/main/res/values-fi/strings.xml @@ -333,8 +333,6 @@ EI-TUETTU VERSIO Yksityisyytesi saattaa olla vaarassa tämän sovellusversion, jota ei tueta, vuoksi. Päivitä versio heti. Sovellusversiotasi ei tueta. - PÄIVITYS SAATAVILLA - Asenna Mullvad VPN (%1$s) pysyäksesi ajan tasalla Päivitys saatavilla. Lataa se pysyäksesi suojattuna. Päivitä DNS-palvelin Päivitä luettelon nimi 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 8a9eb7407a7b..2f4006cecb45 100644 --- a/android/lib/resource/src/main/res/values-fr/strings.xml +++ b/android/lib/resource/src/main/res/values-fr/strings.xml @@ -333,8 +333,6 @@ VERSION NON PRISE EN CHARGE Votre confidentialité peut être en danger avec cette version non prise en charge de l\'application. Veuillez la mettre à jour maintenant. Vous utilisez une version de l\'application non prise en charge. - MISE À JOUR DISPONIBLE - Installez Mullvad VPN (%1$s) pour rester à jour Mise à jour disponible. Téléchargez-la pour rester en sécurité. Mettre à jour le serveur DNS Mettre à jour le nom de la liste 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 ba9ff2581c36..7e2d43c6793f 100644 --- a/android/lib/resource/src/main/res/values-it/strings.xml +++ b/android/lib/resource/src/main/res/values-it/strings.xml @@ -333,8 +333,6 @@ VERSIONE NON SUPPORTATA La tua privacy potrebbe essere a rischio con questa versione dell\'app non supportata. Aggiornala subito. Stai eseguendo una versione dell\'app non supportata. - AGGIORNAMENTO DISPONIBILE - Installa Mullvad VPN (%1$s) per rimanere aggiornato Aggiornamento disponibile; esegui il download per rimanere protetto. Aggiorna server DNS Aggiorna nome elenco 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 d367fa100787..2dccaeb446f1 100644 --- a/android/lib/resource/src/main/res/values-ja/strings.xml +++ b/android/lib/resource/src/main/res/values-ja/strings.xml @@ -333,8 +333,6 @@ 未対応のバージョン このアプリバージョンはサポートされていないため、プライバシーが危険にさらされる可能性があります。今すぐアップデートしてください。 サポート対象外バージョンのアプリを実行しています。 - アップデート可 - Mullvad VPN (%1$s) をインストールして常に最新の状態を保ちましょう アップデートできます。セキュリティを維持するにはダウンロードしてしてください。 DNS サーバーを更新 リスト名の更新 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 42447b8fcb5a..56d97600223d 100644 --- a/android/lib/resource/src/main/res/values-ko/strings.xml +++ b/android/lib/resource/src/main/res/values-ko/strings.xml @@ -333,8 +333,6 @@ 지원되지 않는 버전 지원되지 않는 이 앱 버전으로 인해 개인 정보가 위험할 수 있습니다. 지금 업데이트하세요. 지원되지 않는 앱 버전을 실행 중입니다. - 업데이트 사용 가능 - Mullvad VPN(%1$s)을 설치하여 최신 상태로 유지하세요. 업데이트를 사용할 수 있습니다. 안전을 유지하기 위해 다운로드하세요. DNS 서버 업데이트 목록 이름 업데이트 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 cc49a1b25bef..43333a80288d 100644 --- a/android/lib/resource/src/main/res/values-my/strings.xml +++ b/android/lib/resource/src/main/res/values-my/strings.xml @@ -333,8 +333,6 @@ တွဲဖက်မလုပ်ဆောင်နိုင်သည့် ဗားရှင်း တွဲဖက်မလုပ်ဆောင်နိုင်သည့် ဤအက်ပ်ဗားရှင်းကြောင့် သင့်ကိုယ်ရေးအချက်အလက်များ အန္တရာယ် ရှိနိုင်ပါသည်။ ယခုပင် အပ်ဒိတ်လုပ်ပေးပါ။ တွဲဖက်မလုပ်ဆောင်နိုင်သည့် အက်ပ်ဗားရှင်းဖြင့် လုပ်ဆောင်နေပါသည်။ - အပ်ဒိတ် ရရှိနိုင်ပါပြီ - အပ်ဒိတ် ဖြစ်နေစေရန် Mullvad VPN (%1$s) ကို ထည့်သွင်းပါ အပ်ဒိတ် ရရှိနိုင်ပါပြီ၊ ဆက်လက် လုံခြုံစေရန် ဒေါင်းလုဒ်လုပ်ပါ။ DNS ဆာဗာကို အပ်ဒိတ်လုပ်ရန် စာရင်း အမည်ကို အပ်ဒိတ်လုပ်ရန် 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 b57eb756b421..af8fd509ff02 100644 --- a/android/lib/resource/src/main/res/values-nb/strings.xml +++ b/android/lib/resource/src/main/res/values-nb/strings.xml @@ -333,8 +333,6 @@ VERSJON UTEN STØTTE Personvernet ditt kan være i fare med denne appversjonen som ikke støttes. Oppdater nå. Du kjører en appversjon som ikke støttes. - OPPDATERING TILGJENGELIG - Installer Mullvad VPN (%1$s) for å holde deg oppdatert Oppdatering tilgjengelig. Last ned for å oppdatere sikkerheten. Oppdater DNS-serveren Oppdater listenavn 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 c8fc0d3089c7..8ea1498751de 100644 --- a/android/lib/resource/src/main/res/values-nl/strings.xml +++ b/android/lib/resource/src/main/res/values-nl/strings.xml @@ -333,8 +333,6 @@ NIET-ONDERSTEUNDE VERSIE Uw privacy kan risico lopen met deze niet-ondersteunde appversie. Werk de app nu bij. U gebruikt een niet-ondersteunde versie van de app. - UPDATE BESCHIKBAAR - Installeer Mullvad VPN (%1$s) om up-to-date te blijven Update beschikbaar, download deze om veilig te blijven. DNS-server bijwerken Lijstnaam bijwerken 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 e050dc323b86..2065ca4fbe8e 100644 --- a/android/lib/resource/src/main/res/values-pl/strings.xml +++ b/android/lib/resource/src/main/res/values-pl/strings.xml @@ -333,8 +333,6 @@ WERSJA NIEOBSŁUGIWANA W tej nieobsługiwanej wersji aplikacji prywatność może być zagrożona. Zaktualizuj już teraz. Używasz nieobsługiwanej wersji aplikacji. - DOSTĘPNA JEST AKTUALIZACJA - Aby być na bieżąco, zainstaluj Mullvad VPN (%1$s) Dostępna jest aktualizacja. Aby zachować bezpieczeństwo, pobierz ją. Zaktualizuj serwer DNS Zaktualizuj nazwę listy 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 53b0b3aeaffa..a56dd91a24c8 100644 --- a/android/lib/resource/src/main/res/values-pt/strings.xml +++ b/android/lib/resource/src/main/res/values-pt/strings.xml @@ -333,8 +333,6 @@ VERSÃO NÃO SUPORTADA A sua privacidade pode estar comprometida com uma versão não suportada da aplicação. Por favor efetue a atualização agora. Está a executar uma versão da aplicação não suportada. - ESTÁ DISPONÍVEL UMA ATUALIZAÇÃO - Instalar o Mullvad VPN (%1$s) para ficar atualizado Atualização disponível, transfira-a para ficar seguro. Atualizar servidor DNS Atualizar nome da lista 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 d6e7e67b066d..56d6882dec61 100644 --- a/android/lib/resource/src/main/res/values-ru/strings.xml +++ b/android/lib/resource/src/main/res/values-ru/strings.xml @@ -333,8 +333,6 @@ НЕПОДДЕРЖИВАЕМАЯ ВЕРСИЯ Эта версия приложения не поддерживается, что может угрожать неприкосновенности ваших данных. Обновите приложение. Версия приложения, с которой вы работаете, не поддерживается. - ЕСТЬ ОБНОВЛЕНИЕ - Пользуйтесь актуальной версией — установите Mullvad VPN (%1$s) Вышло обновление. Установите его, чтобы защитить подключения. Обновить DNS-сервер Обновление названия списка 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 e95cde42998d..75aaa1a44c1a 100644 --- a/android/lib/resource/src/main/res/values-sv/strings.xml +++ b/android/lib/resource/src/main/res/values-sv/strings.xml @@ -333,8 +333,6 @@ VERSION UTAN STÖD Din sekretess kan vara utsatt för risk med den här appversionen som inte stöds. Uppdatera nu. Du kör en appversion som inte stöds. - UPPDATERING TILLGÄNGLIG - Installera Mullvad VPN (%1$s) för att hålla dig uppdaterad Uppdatering tillgänglig. Ladda ned för att vara säker. Uppdatera DNS-server Uppdatera listnamn 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 0fac0a4bb5f3..08ae5c334c90 100644 --- a/android/lib/resource/src/main/res/values-th/strings.xml +++ b/android/lib/resource/src/main/res/values-th/strings.xml @@ -333,8 +333,6 @@ เวอร์ชันที่ไม่รองรับ ความเป็นส่วนตัวของคุณอาจมีความเสี่ยง ในขณะที่ใช้งานเวอร์ชันแอปที่ไม่ได้รับการสนับสนุนนี้ โปรดอัปเดตตอนนี้เลย คุณกำลังใช้งานเวอร์ชันแอปที่ไม่ได้รับการสนับสนุน - มีการอัปเดตให้ใช้งาน - ติดตั้ง Mullvad VPN (%1$s) เพื่อรับอัปเดตล่าสุดอยู่เสมอ มีอัปเดตพร้อมใช้งาน ดาวน์โหลดเพื่อคงความปลอดภัยไว้ อัปเดตเซิร์ฟเวอร์ DNS อัปเดตชื่อรายการ 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 6ddc3fa1c867..66d83e9feca3 100644 --- a/android/lib/resource/src/main/res/values-tr/strings.xml +++ b/android/lib/resource/src/main/res/values-tr/strings.xml @@ -333,8 +333,6 @@ DESTEKLENMEYEN SÜRÜM Bu desteklenmeyen uygulama sürümüyle gizliliğiniz risk altında olabilir. Lütfen hemen güncelleyin. Desteklenmeyen bir uygulama sürümünü kullanıyorsunuz. - GÜNCELLEME MEVCUT - Güncel kalmak için Mullvad VPN (%1$s) yükleyin Güncelleme mevcut, güvende kalmak için güncellemeyi indirin. DNS sunucusunu güncelle Liste adını güncelle 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 7607aae3914b..de62b76cb3c6 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 @@ -333,8 +333,6 @@ 不受支持的版本 此应用版本不受支持，因此您的隐私可能存在风险。请立即更新。 您正在运行不受支持的应用版本。 - 有可用更新 - 安装 Mullvad VPN (%1$s) 以保持最新状态 有可用更新，请下载以保持安全。 更新 DNS 服务器 更新列表名称 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 2d60021e6883..ce923a148dd0 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 @@ -333,8 +333,6 @@ 不支援的版本 此應用程式版本不受支援，因此您的隱私可能存在風險。請立即更新。 您所執行的應用程式版本不受支援。 - 可用的更新 - 安裝 Mullvad VPN (%1$s) 以維持最新狀態 更新可用，請下載以維持安全。 更新 DNS 伺服器 更新清單名稱 diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot index 664a1951e0a9..7aea156fb992 100644 --- a/gui/locales/messages.pot +++ b/gui/locales/messages.pot @@ -2315,9 +2315,6 @@ msgstr "" msgid "Importing new overrides might replace some previously imported overrides." msgstr "" -msgid "Install Mullvad VPN (%s) to stay up to date" -msgstr "" - msgid "Invalid or missing value \"%s\"" msgstr ""