diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
index c744beae564b..ab708e77d19f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt
@@ -50,7 +50,7 @@ fun FilterRow(
) {
if (showTitle) {
Text(
- text = stringResource(id = R.string.filtered),
+ text = stringResource(id = R.string.filters),
color = MaterialTheme.colorScheme.onPrimary,
style = MaterialTheme.typography.labelMedium,
)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
index 337798122c08..5ad5eb1507b2 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt
@@ -1,6 +1,7 @@
package net.mullvad.mullvadvpn.compose.screen.location
import android.annotation.SuppressLint
+import androidx.compose.animation.AnimatedContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
@@ -261,12 +262,15 @@ fun SelectLocationScreen(
)
Column(modifier = modifier.background(backgroundColor).fillMaxSize()) {
- if (state.filterChips.isNotEmpty()) {
- FilterRow(
- filters = state.filterChips,
- onRemoveOwnershipFilter = removeOwnershipFilter,
- onRemoveProviderFilter = removeProviderFilter,
- )
+ AnimatedContent(targetState = state.filterChips, label = "Select location top bar") {
+ filterChips ->
+ if (filterChips.isNotEmpty()) {
+ FilterRow(
+ filters = filterChips,
+ onRemoveOwnershipFilter = removeOwnershipFilter,
+ onRemoveProviderFilter = removeProviderFilter,
+ )
+ }
}
if (state.multihopEnabled) {
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 ae4ba53470fa..88c135c30464 100644
--- a/android/lib/resource/src/main/res/values-da/strings.xml
+++ b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -154,7 +154,6 @@
Server IP tilsidesættelse
Tilsløring
Filter
- Filtreret:
Viser den aktuelle VPN-tunnelstatus
VPN-tunnelstatus
Gå til login
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 816f453b14fc..fdaceb289916 100644
--- a/android/lib/resource/src/main/res/values-de/strings.xml
+++ b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -154,7 +154,6 @@
Server-IP überschreiben
Verschleierung
Filter
- Gefiltert:
Zeigt den aktuellen Status des VPN-Tunnels an
Status des VPN-Tunnels
Zur Anmeldung
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 a0358aed46eb..fb5981905b5c 100644
--- a/android/lib/resource/src/main/res/values-es/strings.xml
+++ b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -154,7 +154,6 @@
Anulación de IP de servidor
Ofuscación
Filtrar
- Filtros aplicados:
Muestra el estado actual del túnel VPN
Estado del túnel VPN
Iniciar sesión
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 419a2161eba1..38e2a76a8d5d 100644
--- a/android/lib/resource/src/main/res/values-fi/strings.xml
+++ b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -154,7 +154,6 @@
Palvelimen IP-osoitteen ohitus
Hämäysteknologia
Suodatin
- Suodatettu:
Näyttää VPN-tunnelin nykyisen tilan
VPN-tunnelin tila
Siirry kirjautumiseen
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 f2979cf38b79..cd70ac2701bd 100644
--- a/android/lib/resource/src/main/res/values-fr/strings.xml
+++ b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -154,7 +154,6 @@
Substitution d\'IP de serveur
Dissimulation
Filtrer
- Filtré :
Affiche l\'état actuel du tunnel VPN
État du tunnel VPN
Aller à la connexion
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 2b71d3f0fbf6..70a08dbf7c1b 100644
--- a/android/lib/resource/src/main/res/values-it/strings.xml
+++ b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -154,7 +154,6 @@
Sovrascritture IP server
Offuscamento
Filtra
- Filtrato:
Mostra lo stato attuale del tunnel VPN
Stato del tunnel VPN
Vai al login
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 5f7212100f9e..2fb24ebe8e87 100644
--- a/android/lib/resource/src/main/res/values-ja/strings.xml
+++ b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -154,7 +154,6 @@
サーバーIPのオーバーライド
難読化
絞り込み
- 絞り込み結果:
現在のVPNトンネルのステータスを表示します
VPNトンネルのステータス
ログインに進む
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 0a615b3afcaa..f8727aabbc34 100644
--- a/android/lib/resource/src/main/res/values-ko/strings.xml
+++ b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -154,7 +154,6 @@
서버 IP 재정의
난독 처리
필터
- 필터링됨:
현재 VPN 터널 상태 표시
VPN 터널 상태
로그인하기
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 c9ca31d1593c..5c9cd497f23a 100644
--- a/android/lib/resource/src/main/res/values-my/strings.xml
+++ b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -154,7 +154,6 @@
ဆာဗာ IP ကျော်လွန် ပယ်ဖျက်မှု
Obfuscation
စစ်ထုတ်မှု
- စစ်ထုတ်ထားသော-
လက်ရှိ VPN Tunnel အခြေအနေကို ပြသပေးပါသည်
VPN Tunnel အခြေအနေ
ဝင်ရောက်ရန် သွားပါ
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 6f9ee6600bb0..bef18f462924 100644
--- a/android/lib/resource/src/main/res/values-nb/strings.xml
+++ b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -154,7 +154,6 @@
Overstyring av server-IP
Tilsløring
Filter
- Filtrert:
Viser gjeldende VPN-tunnelstatus
VPN-tunnelstatus
Gå til pålogging
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 9865bcdbec39..e965388f4024 100644
--- a/android/lib/resource/src/main/res/values-nl/strings.xml
+++ b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -154,7 +154,6 @@
Overschrijving van server-IP-adressen
Obfuscatie
Filter
- Gefilterd:
Toont de huidige status van de VPN-tunnel
Status VPN-tunnel
Ga naar aanmelden
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 079d6b8f01e2..9fd1e9de55aa 100644
--- a/android/lib/resource/src/main/res/values-pl/strings.xml
+++ b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -154,7 +154,6 @@
Zastąpienie adresu IP serwera
Zaciemnianie
Filtruj
- Odfiltrowane:
Pokazuje bieżący status tunelu VPN
Status tunelu VPN
Przejdź do logowania
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 52ce6d90eb3a..34175af58247 100644
--- a/android/lib/resource/src/main/res/values-pt/strings.xml
+++ b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -154,7 +154,6 @@
Substituição de IP de servidor
Ofuscação
Filtrar
- Filtrado:
Indica o estado atual do túnel VPN
Estado do túnel VPN
Ir para a ligação
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 9afb206f425d..4d7e03a9684b 100644
--- a/android/lib/resource/src/main/res/values-ru/strings.xml
+++ b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -154,7 +154,6 @@
Переопределение IP-адреса сервера
Обфускация
Фильтр
- Фильтр:
Показывает текущее состояние VPN-туннеля
Состояние туннеля VPN
Войти
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 b4f5d576e1c4..a1f0557de748 100644
--- a/android/lib/resource/src/main/res/values-sv/strings.xml
+++ b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -154,7 +154,6 @@
Åsidosättning av server-IP
Obfuskering
Filtrera
- Filtrerat:
Visar nuvarande status för VPN-tunnel
VPN-tunnelstatus
Gå till inloggning
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 6c805bbbf951..9664d0a91788 100644
--- a/android/lib/resource/src/main/res/values-th/strings.xml
+++ b/android/lib/resource/src/main/res/values-th/strings.xml
@@ -154,7 +154,6 @@
โอเวอร์ไรด์ IP เซิร์ฟเวอร์
การทำให้ข้อมูลยุ่งเหยิง
ตัวกรอง
- กรอง:
แสดงสถานะอุโมงค์ VPN ในปัจจุบัน
สถานะอุโมงค์ VPN
ไปเข้าสู่ระบบ
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 e5ee28a97ef5..cdb01b9d2f13 100644
--- a/android/lib/resource/src/main/res/values-tr/strings.xml
+++ b/android/lib/resource/src/main/res/values-tr/strings.xml
@@ -154,7 +154,6 @@
Sunucu IP\'sini geçersiz kılma
Gizleme
Filtrele
- Filtrelendi:
Mevcut VPN tünelinin durumunu gösterir
VPN tüneli durumu
Giriş sayfasına git
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 1a420824b75e..39306a64aef6 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
@@ -154,7 +154,6 @@
服务器 IP 覆盖
混淆
筛选
- 已筛选:
显示当前的 VPN 隧道状态
VPN 隧道状态
前往登录
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 9711aaffd71d..8be3c88b5931 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
@@ -154,7 +154,6 @@
伺服器 IP 覆寫
混淆
篩選
- 已篩選:
顯示目前的 VPN 通道狀態
VPN 通道狀態
前往登入
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
index 601d983da95d..4625fb3b5f08 100644
--- a/android/lib/resource/src/main/res/values/strings.xml
+++ b/android/lib/resource/src/main/res/values/strings.xml
@@ -56,7 +56,6 @@
Owned
Rented
Providers: %d
- Filtered:
Mullvad owned only
All providers
Rented only
@@ -406,6 +405,6 @@
%s (Entry)
%s (Exit)
Search results
- Filters
+ Filters:
Type at least 2 characters to start searching.
diff --git a/desktop/packages/mullvad-vpn/locales/messages.pot b/desktop/packages/mullvad-vpn/locales/messages.pot
index a371a75cbe57..2b9bdee08167 100644
--- a/desktop/packages/mullvad-vpn/locales/messages.pot
+++ b/desktop/packages/mullvad-vpn/locales/messages.pot
@@ -2452,7 +2452,7 @@ msgstr ""
msgid "File"
msgstr ""
-msgid "Filters"
+msgid "Filters:"
msgstr ""
msgid "Go to VPN settings"