Merge branch 'connecting-is-not-translated-droid-1891'

9 files changed, 20 insertions, 22 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/PlayPayment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
index ce2c49bf9c..16fee5e4b4 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/PlayPayment.kt
@@ -145,9 +145,7 @@ fun PlayPayment(
                             PaymentStatus.PENDING ->
                                 stringResource(id = R.string.payment_status_pending)
                             PaymentStatus.VERIFICATION_IN_PROGRESS ->
-                                stringResource(
-                                    id = R.string.payment_status_verification_in_progress
-                                )
+                                stringResource(id = R.string.verifying_purchase)
                             else -> null
                         }
                     statusMessage?.let {
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 7d4e2a5838..796cd0ca6a 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
@@ -105,7 +105,7 @@ fun ConnectionDetails(
                     buildString {
                         append(stringResource(R.string.connection_details_out))
                         append(SPACE_CHAR)
-                        append(stringResource(R.string.connection_details_ipv4))
+                        append(stringResource(R.string.ipv4))
                     },
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                 style = MaterialTheme.typography.bodySmall,
@@ -150,7 +150,7 @@ fun ConnectionDetails(
                     buildString {
                         append(stringResource(R.string.connection_details_out))
                         append(SPACE_CHAR)
-                        append(stringResource(R.string.connection_details_ipv6))
+                        append(stringResource(R.string.ipv6))
                     },
                 color = MaterialTheme.colorScheme.onSurfaceVariant,
                 style = MaterialTheme.typography.bodySmall,
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..44999cf9e6 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
@@ -83,16 +83,16 @@ private fun FeatureIndicator.text(): String {
     val resource =
         when (this) {
             FeatureIndicator.QUANTUM_RESISTANCE -> R.string.feature_quantum_resistant
-            FeatureIndicator.SPLIT_TUNNELING -> R.string.feature_split_tunneling
+            FeatureIndicator.SPLIT_TUNNELING -> R.string.split_tunneling
             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.LAN_SHARING -> R.string.local_network_sharing
+            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.SERVER_IP_OVERRIDE -> R.string.server_ip_override
             FeatureIndicator.CUSTOM_MTU -> R.string.feature_custom_mtu
             FeatureIndicator.DAITA -> R.string.daita
-            FeatureIndicator.MULTIHOP -> R.string.feature_multihop
+            FeatureIndicator.MULTIHOP -> R.string.multihop
         }
     return textResource(resource)
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/PaymentDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/PaymentDialog.kt
index 72fdd752e9..9e64e0f037 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/PaymentDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/PaymentDialog.kt
@@ -54,7 +54,7 @@ private fun PreviewPaymentDialogPurchasePending() {
         PaymentDialog(
             paymentDialogData =
                 PaymentDialogData(
-                    title = R.string.payment_pending_dialog_title,
+                    title = R.string.verifying_purchase,
                     message = R.string.payment_pending_dialog_message,
                     confirmAction = PaymentDialogAction.Close,
                     closeOnDismiss = true,
@@ -90,7 +90,7 @@ private fun PreviewPaymentDialogLoading() {
         PaymentDialog(
             paymentDialogData =
                 PaymentDialogData(
-                    title = R.string.loading_connecting,
+                    title = R.string.connecting,
                     icon = PaymentDialogIcon.LOADING,
                     closeOnDismiss = false,
                 ),
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
index 6b7ea8a669..0e3f77f6dc 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/payment/VerificationPendingDialog.kt
@@ -33,7 +33,7 @@ fun VerificationPendingDialog(onClose: () -> Unit) {
         icon = {}, // Makes it look a bit more balanced
         title = {
             Text(
-                text = stringResource(id = R.string.payment_pending_dialog_title),
+                text = stringResource(id = R.string.verifying_purchase),
                 style = MaterialTheme.typography.headlineSmall,
             )
         },
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
index df51055b60..5fe0daccac 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt
@@ -179,7 +179,7 @@ fun ServerIpOverridesScreen(
     var showBottomSheet by remember { mutableStateOf(false) }
 
     ScaffoldWithMediumTopBar(
-        appBarTitle = stringResource(id = R.string.server_ip_overrides),
+        appBarTitle = stringResource(id = R.string.server_ip_override),
         navigationIcon = { NavigateBackIconButton(onNavigateBack = onBackClick) },
         actions = {
             TopBarActions(
@@ -206,7 +206,7 @@ fun ServerIpOverridesScreen(
             SnackbarHost(hostState = snackbarHostState) { MullvadSnackbar(snackbarData = it) }
             PrimaryButton(
                 onClick = { showBottomSheet = true },
-                text = stringResource(R.string.server_ip_overrides_import_button),
+                text = stringResource(R.string.import_overrides_import),
                 modifier =
                     Modifier.padding(horizontal = Dimens.sideMargin)
                         .padding(bottom = Dimens.screenVerticalMargin)
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..a257341175 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() },
@@ -667,14 +667,14 @@ fun VpnSettingsScreen(
             }
             itemWithDivider {
                 SelectableCell(
-                    title = stringResource(id = R.string.device_ip_version_ipv4),
+                    title = stringResource(id = R.string.ipv4),
                     isSelected = state.deviceIpVersion.getOrNull() == IpVersion.IPV4,
                     onCellClicked = { onSelectDeviceIpVersion(Constraint.Only(IpVersion.IPV4)) },
                 )
             }
             item {
                 SelectableCell(
-                    title = stringResource(id = R.string.device_ip_version_ipv6),
+                    title = stringResource(id = R.string.ipv6),
                     isSelected = state.deviceIpVersion.getOrNull() == IpVersion.IPV6,
                     onCellClicked = { onSelectDeviceIpVersion(Constraint.Only(IpVersion.IPV6)) },
                 )
@@ -694,7 +694,7 @@ fun VpnSettingsScreen(
 @Composable
 private fun ServerIpOverrides(onServerIpOverridesClick: () -> Unit) {
     NavigationComposeCell(
-        title = stringResource(id = R.string.server_ip_overrides),
+        title = stringResource(id = R.string.server_ip_override),
         onClick = onServerIpOverridesClick,
     )
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PurchaseResultExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PurchaseResultExtensions.kt
index c04b81566e..216a995cce 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PurchaseResultExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/PurchaseResultExtensions.kt
@@ -20,7 +20,7 @@ fun PurchaseResult.toPaymentDialogData(): PaymentDialogData? =
         PurchaseResult.FetchingProducts,
         PurchaseResult.FetchingObfuscationId ->
             PaymentDialogData(
-                title = R.string.loading_connecting,
+                title = R.string.connecting,
                 icon = PaymentDialogIcon.LOADING,
                 closeOnDismiss = false,
             )
@@ -35,7 +35,7 @@ fun PurchaseResult.toPaymentDialogData(): PaymentDialogData? =
         PurchaseResult.Completed.Pending,
         is PurchaseResult.Error.VerificationError ->
             PaymentDialogData(
-                title = R.string.payment_pending_dialog_title,
+                title = R.string.verifying_purchase,
                 message = R.string.payment_pending_dialog_message,
                 confirmAction = PaymentDialogAction.Close,
             )