Merge branch 'change-text-indentation-and-add-checkmark-for-obfuscation-droid-143'

30 files changed, 101 insertions, 62 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
index 47d1c8c894..ff8771452d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/BaseCell.kt
@@ -17,22 +17,19 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.component.SpacedColumn
 import net.mullvad.mullvadvpn.compose.theme.AppTheme
-import net.mullvad.mullvadvpn.compose.theme.MullvadBlue
-import net.mullvad.mullvadvpn.compose.theme.MullvadDarkBlue
+import net.mullvad.mullvadvpn.compose.theme.Dimens
 
 @Preview
 @Composable
 fun PreviewBaseCell() {
     AppTheme {
-        Column {
+        SpacedColumn {
             BaseCell(
                 title = {
                     BaseCellTitle(
@@ -41,7 +38,6 @@ fun PreviewBaseCell() {
                     )
                 }
             )
-            Spacer(modifier = Modifier.height(1.dp))
             BaseCell(
                 title = {
                     BaseCellTitle(
@@ -57,20 +53,17 @@ fun PreviewBaseCell() {
 @Composable
 internal fun BaseCell(
     modifier: Modifier = Modifier,
+    iconView: @Composable () -> Unit = {},
     title: @Composable () -> Unit,
     bodyView: @Composable () -> Unit = {},
     isRowEnabled: Boolean = true,
     onCellClicked: () -> Unit = {},
     subtitle: @Composable (() -> Unit)? = null,
     subtitleModifier: Modifier = Modifier,
-    background: Color = MullvadBlue,
-    startPadding: Dp = dimensionResource(id = R.dimen.cell_left_padding),
-    endPadding: Dp = dimensionResource(id = R.dimen.cell_right_padding)
+    background: Color = MaterialTheme.colorScheme.primary,
+    startPadding: Dp = Dimens.cellStartPadding,
+    endPadding: Dp = Dimens.cellEndPadding
 ) {
-    val cellHeight = dimensionResource(id = R.dimen.cell_height)
-    val cellVerticalSpacing = dimensionResource(id = R.dimen.cell_label_vertical_padding)
-    val subtitleVerticalSpacing = dimensionResource(id = R.dimen.cell_footer_top_padding)
-
     Column(modifier = Modifier.fillMaxWidth().wrapContentHeight().background(background)) {
         val rowModifier =
             Modifier.let {
@@ -83,10 +76,12 @@ internal fun BaseCell(
             horizontalArrangement = Arrangement.Start,
             modifier =
                 rowModifier
-                    .height(cellHeight)
+                    .height(Dimens.cellHeight)
                     .fillMaxWidth()
                     .padding(start = startPadding, end = endPadding)
         ) {
+            iconView()
+
             title()
 
             Spacer(modifier = Modifier.weight(1.0f))
@@ -98,12 +93,12 @@ internal fun BaseCell(
             Row(
                 modifier =
                     subtitleModifier
-                        .background(MullvadDarkBlue)
+                        .background(MaterialTheme.colorScheme.secondary)
                         .padding(
                             start = startPadding,
-                            top = subtitleVerticalSpacing,
+                            top = Dimens.cellFooterTopPadding,
                             end = endPadding,
-                            bottom = cellVerticalSpacing
+                            bottom = Dimens.cellLabelVerticalPadding
                         )
                         .fillMaxWidth()
                         .wrapContentHeight()
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt
index 17a8065693..8e73679652 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/ExpandableComposeCell.kt
@@ -21,8 +21,8 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.ChevronView
 import net.mullvad.mullvadvpn.compose.component.HtmlText
 import net.mullvad.mullvadvpn.compose.component.textResource
-import net.mullvad.mullvadvpn.compose.theme.AlphaActive
 import net.mullvad.mullvadvpn.compose.theme.AlphaInactive
+import net.mullvad.mullvadvpn.compose.theme.AlphaVisible
 import net.mullvad.mullvadvpn.compose.theme.MullvadWhite
 import net.mullvad.mullvadvpn.compose.theme.MullvadWhite60
 
@@ -46,7 +46,7 @@ fun ExpandableComposeCell(
     onCellClicked: (Boolean) -> Unit = {},
     onInfoClicked: (() -> Unit)? = null
 ) {
-    val titleModifier = Modifier.alpha(if (isEnabled) AlphaActive else AlphaInactive)
+    val titleModifier = Modifier.alpha(if (isEnabled) AlphaVisible else AlphaInactive)
     val bodyViewModifier = Modifier
 
     BaseCell(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt
index 32ccd1365d..21a3af926e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/InformationComposeCell.kt
@@ -17,8 +17,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.compose.theme.AlphaActive
 import net.mullvad.mullvadvpn.compose.theme.AlphaInactive
+import net.mullvad.mullvadvpn.compose.theme.AlphaVisible
 import net.mullvad.mullvadvpn.compose.theme.MullvadBlue
 import net.mullvad.mullvadvpn.compose.theme.MullvadWhite
 
@@ -41,7 +41,7 @@ fun InformationComposeCell(
     onCellClicked: () -> Unit = {},
     onInfoClicked: (() -> Unit)? = null
 ) {
-    val titleModifier = Modifier.alpha(if (isEnabled) AlphaActive else AlphaInactive)
+    val titleModifier = Modifier.alpha(if (isEnabled) AlphaVisible else AlphaInactive)
     val bodyViewModifier = Modifier
 
     BaseCell(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
index cead89cc63..95272acf11 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/SelectableCell.kt
@@ -1,21 +1,55 @@
 package net.mullvad.mullvadvpn.compose.cell
 
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
+import net.mullvad.mullvadvpn.R
+import net.mullvad.mullvadvpn.compose.component.SpacedColumn
+import net.mullvad.mullvadvpn.compose.theme.AlphaInvisible
+import net.mullvad.mullvadvpn.compose.theme.AlphaVisible
+import net.mullvad.mullvadvpn.compose.theme.AppTheme
 import net.mullvad.mullvadvpn.compose.theme.Dimens
 
+@Preview
+@Composable
+private fun PreviewSelectableCell() {
+    AppTheme {
+        SpacedColumn(Modifier.background(MaterialTheme.colorScheme.background)) {
+            SelectableCell(title = "Selected", isSelected = true)
+            SelectableCell(title = "Not Selected", isSelected = false)
+        }
+    }
+}
+
 @Composable
 fun SelectableCell(
     title: String,
     isSelected: Boolean,
+    iconContentDescription: String? = null,
+    selectedIcon: @Composable () -> Unit = {
+        Icon(
+            painter = painterResource(id = R.drawable.icon_tick),
+            contentDescription = iconContentDescription,
+            tint = MaterialTheme.colorScheme.onPrimary,
+            modifier =
+                Modifier.padding(end = Dimens.selectableCellTextMargin)
+                    .alpha(if (isSelected) AlphaVisible else AlphaInvisible)
+        )
+    },
     titleStyle: TextStyle = MaterialTheme.typography.labelLarge,
-    startPadding: Dp = Dimens.indentedCellStartPadding,
+    startPadding: Dp = Dimens.cellStartPadding,
     selectedColor: Color = MaterialTheme.colorScheme.surface,
     backgroundColor: Color = MaterialTheme.colorScheme.secondaryContainer,
-    onCellClicked: () -> Unit = {},
+    onCellClicked: () -> Unit = {}
 ) {
     BaseCell(
         onCellClicked = onCellClicked,
@@ -26,6 +60,7 @@ fun SelectableCell(
             } else {
                 backgroundColor
             },
-        startPadding = startPadding
+        startPadding = startPadding,
+        iconView = selectedIcon
     )
 }
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 afbf04ec33..531af3ef46 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
@@ -1,10 +1,7 @@
 package net.mullvad.mullvadvpn.compose.cell
 
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentWidth
@@ -23,6 +20,7 @@ import androidx.core.text.HtmlCompat
 import androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.component.CellSwitch
+import net.mullvad.mullvadvpn.compose.component.SpacedColumn
 import net.mullvad.mullvadvpn.compose.component.textResource
 import net.mullvad.mullvadvpn.compose.extensions.toAnnotatedString
 import net.mullvad.mullvadvpn.compose.theme.AppTheme
@@ -32,7 +30,7 @@ import net.mullvad.mullvadvpn.compose.theme.Dimens
 @Composable
 private fun PreviewSwitchComposeCell() {
     AppTheme {
-        Column {
+        SpacedColumn {
             HeaderSwitchComposeCell(
                 title = "Checkbox Title",
                 isEnabled = true,
@@ -40,7 +38,6 @@ private fun PreviewSwitchComposeCell() {
                 onCellClicked = {},
                 onInfoClicked = {}
             )
-            Spacer(modifier = Modifier.height(1.dp))
             HeaderSwitchComposeCell(
                 title = "Checkbox Title",
                 isEnabled = true,
@@ -49,7 +46,6 @@ private fun PreviewSwitchComposeCell() {
                 onInfoClicked = {},
                 subtitle = "Subtitle"
             )
-            Spacer(modifier = Modifier.height(1.dp))
             NormalSwitchComposeCell(
                 title = "Checkbox Item",
                 isEnabled = true,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt
new file mode 100644
index 0000000000..7a78d66ac1
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/SpacedColumn.kt
@@ -0,0 +1,24 @@
+package net.mullvad.mullvadvpn.compose.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ColumnScope
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.Dp
+import net.mullvad.mullvadvpn.compose.theme.Dimens
+
+@Composable
+fun SpacedColumn(
+    modifier: Modifier = Modifier,
+    spacing: Dp = Dimens.listItemDivider,
+    alignment: Alignment.Vertical = Alignment.Bottom,
+    content: @Composable ColumnScope.() -> Unit
+) {
+    Column(
+        modifier = modifier,
+        verticalArrangement = Arrangement.spacedBy(spacing, alignment),
+        content = content
+    )
+}
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
index 2c0adcf4cf..49fe9a1b26 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/component/Switch.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import net.mullvad.mullvadvpn.compose.theme.AlphaActive
 import net.mullvad.mullvadvpn.compose.theme.AlphaInactive
+import net.mullvad.mullvadvpn.compose.theme.AlphaVisible
 import net.mullvad.mullvadvpn.compose.theme.MullvadGreen
 import net.mullvad.mullvadvpn.compose.theme.MullvadRed
 import net.mullvad.mullvadvpn.compose.theme.MullvadWhite
@@ -81,7 +81,7 @@ fun CellSwitch(
         // Track
         drawRoundRect(
             color = thumbColor,
-            alpha = if (isEnabled) AlphaActive else AlphaInactive,
+            alpha = if (isEnabled) AlphaVisible else AlphaInactive,
             cornerRadius = CornerRadius(x = 15.dp.toPx(), y = 15.dp.toPx()),
             style =
                 Stroke(
@@ -94,7 +94,7 @@ fun CellSwitch(
         // Thumb
         drawCircle(
             color = if (isChecked) thumbCheckedTrackColor else thumbUncheckedTrackColor,
-            alpha = if (isEnabled) AlphaActive else AlphaInactive,
+            alpha = if (isEnabled) AlphaVisible else AlphaInactive,
             radius = thumbRadius.toPx(),
             center =
                 Offset(
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
index 77e82280bb..0efd386e50 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/Color.kt
@@ -21,5 +21,6 @@ val MullvadWhite40 = Color(0x66FFFFFF)
 val MullvadWhite60 = Color(0x99FFFFFF)
 val MullvadWhite80 = Color(0xCCFFFFFF)
 
-const val AlphaActive = 1f
+const val AlphaVisible = 1f
 const val AlphaInactive = 0.4f
+const val AlphaInvisible = 0f
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt
index 04236760d3..a4bcf31a14 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/theme/dimensions/Dimensions.kt
@@ -4,19 +4,23 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 data class Dimensions(
-    val mediumPadding: Dp = 16.dp,
-    val smallPadding: Dp = 8.dp,
+    val cellEndPadding: Dp = 16.dp,
+    val cellFooterTopPadding: Dp = 6.dp,
+    val cellHeight: Dp = 52.dp,
+    val cellLabelVerticalPadding: Dp = 14.dp,
+    val cellStartPadding: Dp = 22.dp,
+    val indentedCellStartPadding: Dp = 38.dp,
+    val listIconSize: Dp = 24.dp,
     val listItemDivider: Dp = 1.dp,
     val listItemHeight: Dp = 50.dp,
     val listItemHeightExtra: Dp = 60.dp,
+    val loadingSpinnerPadding: Dp = 12.dp,
     val loadingSpinnerSize: Dp = 24.dp,
     val loadingSpinnerStrokeWidth: Dp = 3.dp,
-    val loadingSpinnerPadding: Dp = 12.dp,
-    val cellStartPadding: Dp = 22.dp,
-    val cellEndPadding: Dp = 16.dp,
-    val listIconSize: Dp = 24.dp,
+    val mediumPadding: Dp = 16.dp,
     val progressIndicatorSize: Dp = 60.dp,
-    val indentedCellStartPadding: Dp = 38.dp
+    val selectableCellTextMargin: Dp = 12.dp,
+    val smallPadding: Dp = 8.dp
 )
 
 val defaultDimensions = Dimensions()
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 5c54fa0261..3a3e5c4f49 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">DU LÆKKER MÅSKE NETVÆRKSTRAFIK</string>
     <string name="obfuscation_info">Tilsløring skjuler WireGuard-trafikken inden i en anden protokol. Det kan bruges til at hjælpe med at omgå censur og andre typer filtrering, hvor en almindelig WireGuard-forbindelse ville blive blokeret.</string>
     <string name="obfuscation_on_udp_over_tcp">Til (UDP-over-TCP)</string>
-    <string name="obfuscation_title">Tilsløring</string>
     <string name="off">Fra</string>
     <string name="out_address">Ud</string>
     <string name="out_of_time">Tid udløbet</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 51822b3abe..cfb4b38f28 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">MÖGLICHERWEISE IST IHR NETZWERKVERKEHR UNSICHER</string>
     <string name="obfuscation_info">Bei der Verschleierung wird der WireGuard-Datenverkehr in einem anderen Protokoll versteckt. Sie kann dazu verwendet werden, Zensur und andere Arten von Filtern zu umgehen, bei denen eine reine WireGuard-Verbindung blockiert würde.</string>
     <string name="obfuscation_on_udp_over_tcp">An (UDP über TCP)</string>
-    <string name="obfuscation_title">Verschleierung</string>
     <string name="off">Aus</string>
     <string name="out_address">Ausgehend</string>
     <string name="out_of_time">Zeit abgelaufen</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index eb49e299de..3d8eb2edfa 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">PUEDE QUE SE ESTÉ FILTRANDO EL TRÁFICO DE RED</string>
     <string name="obfuscation_info">La ofuscación oculta el tráfico de WireGuard dentro de otro protocolo. Puede usarse para sortear la censura y otros tipos de filtrado donde podría bloquearse una conexión de WireGuard normal.</string>
     <string name="obfuscation_on_udp_over_tcp">Activado (UDP sobre TCP)</string>
-    <string name="obfuscation_title">Ofuscación</string>
     <string name="off">Desactivado</string>
     <string name="out_address">Salida</string>
     <string name="out_of_time">Tiempo agotado</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 969f0aa9d3..c85d836431 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">VERKKOLIIKENTEESI SAATTAA VUOTAA</string>
     <string name="obfuscation_info">Hämäysteknologian käyttäminen piilottaa WireGuard-liikenteen toisen protokollan sisään. Sitä voidaan käyttää kiertämään sensuuria ja muita suodatuksia niissä tapauksissa, kun tavallinen WireGuard-yhteys muutoin estettäisi.</string>
     <string name="obfuscation_on_udp_over_tcp">Käytössä (UDP TCP:n kautta)</string>
-    <string name="obfuscation_title">Hämäysteknologia</string>
     <string name="off">Pois</string>
     <string name="out_address">Lähtevä</string>
     <string name="out_of_time">Ei käyttöaikaa</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 42b7a8772c..cc22bd40b0 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">VOUS POURRIEZ AVOIR DES FUITES DE TRAFIC RÉSEAU</string>
     <string name="obfuscation_info">La dissimulation cache le trafic WireGuard à l\'intérieur d\'un autre protocole. Elle peut être utilisée pour aider à contourner la censure et d\'autres types de filtrage, où une connexion WireGuard simple serait bloquée.</string>
     <string name="obfuscation_on_udp_over_tcp">Activé (UDP sur TCP)</string>
-    <string name="obfuscation_title">Dissimulation</string>
     <string name="off">Désactivé</string>
     <string name="out_address">Sortante</string>
     <string name="out_of_time">Plus de temps</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index ed84bd66c7..76dbc418ed 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">POSSIBILI PERDITE NEL TRAFFICO DI RETE</string>
     <string name="obfuscation_info">L\'offuscamento nasconde il traffico WireGuard all\'interno di un altro protocollo. Può essere utilizzato per aggirare la censura e altri tipi di filtraggio, in cui una semplice connessione WireGuard verrebbe bloccata.</string>
     <string name="obfuscation_on_udp_over_tcp">On (UDP-over-TCP)</string>
-    <string name="obfuscation_title">Offuscamento</string>
     <string name="off">Off</string>
     <string name="out_address">Invio</string>
     <string name="out_of_time">Scaduto</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index c8ebd205c7..0cbf6919b9 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">ネットワーク通信が漏洩している可能性があります</string>
     <string name="obfuscation_info">難読化は、WireGuardトラフィックを別のプロトコル内に隠します。プレーンなWireGuard接続がブロックされる検閲やその他のフィルタリングを回避するために使用できます。</string>
     <string name="obfuscation_on_udp_over_tcp">オン (UDP-over-TCP)</string>
-    <string name="obfuscation_title">難読化</string>
     <string name="off">オフ</string>
     <string name="out_address">外側</string>
     <string name="out_of_time">時間切れ</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 80caf8bcc3..3384dcaeef 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">네트워크 트래픽이 유출될 수 있습니다.</string>
     <string name="obfuscation_info">난독 처리는 다른 프로토콜 내에서 WireGuard 트래픽을 숨깁니다. 일반 WireGuard 연결이 차단되는 상황에서 검열 및 기타 유형의 필터링을 우회하는 데 사용할 수 있습니다.</string>
     <string name="obfuscation_on_udp_over_tcp">켜기(UDP-over-TCP)</string>
-    <string name="obfuscation_title">난독 처리</string>
     <string name="off">끄기</string>
     <string name="out_address">아웃</string>
     <string name="out_of_time">시간 초과</string>
diff --git a/android/app/src/main/res/values-my/strings.xml b/android/app/src/main/res/values-my/strings.xml
index 7cc6e5b550..734afd5f44 100644
--- a/android/app/src/main/res/values-my/strings.xml
+++ b/android/app/src/main/res/values-my/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">ကွန်ရက် ကူးလူးမှု ပေါက်ကြားနေနိုင်ပါသည်</string>
     <string name="obfuscation_info">Obfuscation သည် အခြားပရိုတိုကောလ်အတွင်းရှိ WireGuard ကူးလူးမှုကို ဝှက်ထားပေးပါသည်။ သာမန် WireGuard ချိတ်ဆက်မှုကို ပိတ်ဆို့မည့် အခြားသော စစ်ထုတ်မှု အမျိုးအစားများနှင့် ဆင်ဆာဖြတ်တောက်ခြင်းကို ရှောင်လွှဲနိုင်စေရာတွင် ကူညီနိုင်စေရန် ဤသည်ကို သုံးနိုင်ပါသည်။</string>
     <string name="obfuscation_on_udp_over_tcp">ဖွင့် (UDP-over-TCP)</string>
-    <string name="obfuscation_title">Obfuscation</string>
     <string name="off">ပိတ်</string>
     <string name="out_address">အထွက်</string>
     <string name="out_of_time">အချိန်စေ့သွားပါပြီ</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 9ff0909593..50fa3f27d8 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">DET KAN VÆRE EN NETTVERKSLEKKASJE HOS DEG</string>
     <string name="obfuscation_info">Tilsløring skjuler WireGuard-trafikken i en annen protokoll. Man kan på den måten omgå sensur og andre typer filter i tilfeller der en vanlig WireGuard-tilkobling ville blitt blokkert.</string>
     <string name="obfuscation_on_udp_over_tcp">På (UDP-over-TCP)</string>
-    <string name="obfuscation_title">Tilsløring</string>
     <string name="off">Av</string>
     <string name="out_address">Utgående</string>
     <string name="out_of_time">Tiden har utløpt</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 5c81fdb4c6..aeb6d84b94 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">U LEKT MOGELIJK NETWERKVERKEER</string>
     <string name="obfuscation_info">Obfuscatie verbergt het WireGuard-verkeer in een ander protocol. Het kan worden gebruikt om censuur en andere soorten filtering te omzeilen, waar een gewone WireGuard-verbinding zou worden geblokkeerd.</string>
     <string name="obfuscation_on_udp_over_tcp">Aan (UDP-over-TCP)</string>
-    <string name="obfuscation_title">Obfuscatie</string>
     <string name="off">Uit</string>
     <string name="out_address">Uit</string>
     <string name="out_of_time">Geen tijd meer</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index d249c35327..3ad1231fa3 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">TWÓJ RUCH SIECIOWY MOŻE WYCIEKAĆ</string>
     <string name="obfuscation_info">Zaciemnianie ukrywa ruch WireGuard w innym protokole. Można go użyć do obchodzenia cenzury i innych typów filtrowania, w których zwykłe połączenie WireGuard byłoby blokowane.</string>
     <string name="obfuscation_on_udp_over_tcp">Wł. (UDP-przez-TCP)</string>
-    <string name="obfuscation_title">Zaciemnianie</string>
     <string name="off">Wył.</string>
     <string name="out_address">Wyjście</string>
     <string name="out_of_time">Koniec czasu</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 4345c4dd3e..c785c58553 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">PODERÁ ESTAR A PERDER TRÁFEGO DE REDE</string>
     <string name="obfuscation_info">A ofuscação oculta o tráfego do WireGuard dentro de outro protocolo. Pode ser utilizado para ajudar a contornar a censura e outros tipos de filtragem, onde uma simples ligação WireGuard seria bloqueada.</string>
     <string name="obfuscation_on_udp_over_tcp">Ligado (UDP sobre TCP)</string>
-    <string name="obfuscation_title">Ofuscação</string>
     <string name="off">Desligado</string>
     <string name="out_address">Saída</string>
     <string name="out_of_time">Sem tempo</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index a3e2b368a1..ee7a1e76a5 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">ВОЗМОЖНА УТЕЧКА СЕТЕВОГО ТРАФИКА</string>
     <string name="obfuscation_info">Обфускация скрывает трафик WireGuard внутри другого протокола. Это может использоваться для обхода цензуры и других видов фильтрации, когда обычное соединение WireGuard было бы заблокировано.</string>
     <string name="obfuscation_on_udp_over_tcp">Вкл. (UDP через TCP)</string>
-    <string name="obfuscation_title">Обфускация</string>
     <string name="off">Выключен</string>
     <string name="out_address">Выход</string>
     <string name="out_of_time">Закончилось время</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 7f0b8515ad..ba27e0ccbf 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">DU KANSKE HAR LÄCKAGE I NÄTVERKSTRAFIKEN</string>
     <string name="obfuscation_info">Obfuskering döljer WireGuard-trafik inne i ett annat protokoll. Det kan användas för att kringgå censur och andra filtertyper där en vanlig WireGuard-anslutning skulle blockeras.</string>
     <string name="obfuscation_on_udp_over_tcp">På (UDP över TCP)</string>
-    <string name="obfuscation_title">Obfuskering</string>
     <string name="off">Av</string>
     <string name="out_address">Ut</string>
     <string name="out_of_time">Ingen tid kvar</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 4f534f5324..8620e90ddf 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">คุณอาจมีการรับส่งข้อมูลทางเครือข่ายที่รั่วไหลอยู่</string>
     <string name="obfuscation_info">ข้อมูลที่คลุมเครือจะซ่อนการรับส่งข้อมูล WireGuard ภายในอีกโพรโทคอลหนึ่ง ซึ่งใช้เพื่อช่วยหลบเลี่ยงการเซ็นเซอร์ และการกรองประเภทอื่นๆ ที่การเชื่อมต่อ WireGuard แบบธรรมดาจะถูกบล็อกได้</string>
     <string name="obfuscation_on_udp_over_tcp">เปิด (UDP-ผ่าน-TCP)</string>
-    <string name="obfuscation_title">ข้อมูลที่คลุมเครือ</string>
     <string name="off">ปิด</string>
     <string name="out_address">ออก</string>
     <string name="out_of_time">หมดเวลา</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 0c527b3bab..398c419f66 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">AĞ TRAFİĞİNİZDE SIZINTI OLABİLİR</string>
     <string name="obfuscation_info">Gizleme, WireGuard trafiğini başka bir protokolün içinde gizler. Normal bir WireGuard bağlantısının engelleneceği sansürü ve diğer filtreleme türlerini aşmaya yardımcı olmak için kullanılabilir.</string>
     <string name="obfuscation_on_udp_over_tcp">Açık (TCP üzerinden UDP)</string>
-    <string name="obfuscation_title">Gizleme</string>
     <string name="off">Kapalı</string>
     <string name="out_address">Çıkış</string>
     <string name="out_of_time">Süre doldu</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 ee0d7b1292..763d554ada 100644
--- a/android/app/src/main/res/values-zh-rCN/strings.xml
+++ b/android/app/src/main/res/values-zh-rCN/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">您的网络流量可能在泄露</string>
     <string name="obfuscation_info">混淆将 WireGuard 流量隐藏在另一个协议中。它可用于帮助规避审查和其他类型的过滤，在这些过滤中，普通的 WireGuard 连接将被阻止。</string>
     <string name="obfuscation_on_udp_over_tcp">开 (UDP-over-TCP)</string>
-    <string name="obfuscation_title">混淆</string>
     <string name="off">关</string>
     <string name="out_address">外部</string>
     <string name="out_of_time">已没有时间</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 789edc7029..7dca1777a7 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -110,7 +110,6 @@
     <string name="not_blocking_internet">您的網路流量可能正在洩露</string>
     <string name="obfuscation_info">藉由混淆，WireGuard 的流量能隱藏在另一個通訊協定中。這有助於規避審查或其他類型的篩選。在這類篩選中，普通 WireGuard 連線將遭到封鎖。</string>
     <string name="obfuscation_on_udp_over_tcp">開 (UDP-over-TCP)</string>
-    <string name="obfuscation_title">混淆</string>
     <string name="off">關閉</string>
     <string name="out_address">出境</string>
     <string name="out_of_time">逾時</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index c09e0e2519..7354d40a11 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -187,7 +187,7 @@
     <string name="settings_changes_effect_warning_short">DNS settings might not go into effect immediately</string>
     <string name="settings_changes_effect_warning_content_blocker">Changes to DNS related settings might not go into effect immediately due to cached results.</string>
     <string name="manage_account">Manage account</string>
-    <string name="obfuscation_title">Obfuscation</string>
+    <string name="obfuscation_title">WireGuard obfuscation</string>
     <string name="obfuscation_info">Obfuscation hides the WireGuard traffic inside another protocol. It can be used to help circumvent censorship and other types of filtering, where a plain WireGuard connect would be blocked.</string>
     <string name="obfuscation_on_udp_over_tcp">On (UDP-over-TCP)</string>
     <string name="automatic">Automatic</string>
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
index 15698d0fbf..857ef608e3 100644
--- a/gui/locales/messages.pot
+++ b/gui/locales/messages.pot
@@ -1773,6 +1773,9 @@ msgstr ""
 msgid "WireGuard MTU"
 msgstr ""
 
+msgid "WireGuard obfuscation"
+msgstr ""
+
 msgid "YOU MIGHT BE LEAKING NETWORK TRAFFIC"
 msgstr ""