Merge remote-tracking branch 'origin/main' into claude/thin-material-icons-9SFWk

# Conflicts:
#	desktopApp/src/jvmMain/kotlin/com/vitorpamplona/amethyst/desktop/Main.kt

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/AccountGiftWrapsEoseManager.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.nip59GiftWraps
 
+import com.vitorpamplona.amethyst.commons.relayClient.nip17Dm.filterGiftWrapsToPubkey
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.relayClient.eoseManagers.PerUserEoseManager
 import com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.AccountQueryState

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/nip59GiftWraps/FilterGiftWrapsToPubkey.kt

@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2025 Vitor Pamplona
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
- * Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.nip59GiftWraps
-
-import com.vitorpamplona.quartz.nip01Core.core.HexKey
-import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
-import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
-import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
-import com.vitorpamplona.quartz.nip59Giftwrap.wraps.EphemeralGiftWrapEvent
-import com.vitorpamplona.quartz.nip59Giftwrap.wraps.GiftWrapEvent
-import com.vitorpamplona.quartz.utils.TimeUtils
-
-fun filterGiftWrapsToPubkey(
-    relay: NormalizedRelayUrl,
-    pubkey: HexKey?,
-    since: Long?,
-): List<RelayBasedFilter> {
-    if (pubkey.isNullOrEmpty()) return emptyList()
-
-    return listOf(
-        RelayBasedFilter(
-            relay = relay,
-            filter =
-                Filter(
-                    kinds = listOf(GiftWrapEvent.KIND, EphemeralGiftWrapEvent.KIND),
-                    tags = mapOf("p" to listOf(pubkey)),
-                    since = since?.minus(TimeUtils.twoDays()),
-                ),
-        ),
-    )
-}

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt

@@ -231,19 +231,28 @@ fun NonClickableUserPictures(
     room: ChatroomKey,
     size: Dp,
     accountViewModel: AccountViewModel,
+) {
+    NonClickableUserPictures(room.users.toList(), size, accountViewModel)
+}
+
+@Composable
+fun NonClickableUserPictures(
+    userHexList: List<HexKey>,
+    size: Dp,
+    accountViewModel: AccountViewModel,
 ) {
     Box(Modifier.size(size), contentAlignment = Alignment.TopEnd) {
-        when (room.users.size) {
+        when (userHexList.size) {
             0 -> {}
 
             1 -> {
-                LoadUser(baseUserHex = room.users.first(), accountViewModel) {
+                LoadUser(baseUserHex = userHexList.first(), accountViewModel) {
                     it?.let { BaseUserPicture(it, size, accountViewModel, outerModifier = Modifier) }
                 }
             }
 
             2 -> {
-                val userList = room.users.toList()
+                val userList = userHexList
 
                 LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {
@@ -268,7 +277,7 @@ fun NonClickableUserPictures(
             }
 
             3 -> {
-                val userList = room.users.toList()
+                val userList = userHexList
 
                 LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {
@@ -303,7 +312,7 @@ fun NonClickableUserPictures(
             }
 
             else -> {
-                val userList = room.users.toList()
+                val userList = userHexList
 
                 LoadUser(baseUserHex = userList[0], accountViewModel) {
                     it?.let {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupChatScreen.kt

@@ -21,7 +21,9 @@
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.marmotGroup
 
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -32,14 +34,18 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.vitorpamplona.amethyst.commons.icons.symbols.Icon
 import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
 import com.vitorpamplona.amethyst.ui.layouts.DisappearingScaffold
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
+import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.privateDM.header.DisplayUserSetAsSubject
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -55,6 +61,8 @@ fun MarmotGroupChatScreen(
         }
     val displayName by chatroom.displayName.collectAsStateWithLifecycle()
     val memberCount by chatroom.memberCount.collectAsStateWithLifecycle()
+    val members by chatroom.members.collectAsStateWithLifecycle()
+    val memberPubkeys = remember(members) { members.map { it.pubkey } }
 
     DisappearingScaffold(
         isInvertedLayout = true,
@@ -69,19 +77,39 @@ fun MarmotGroupChatScreen(
                     }
                 },
                 title = {
-                    Column(
+                    Row(
                         modifier =
                             Modifier.clickable {
                                 nav.nav(Route.MarmotGroupInfo(nostrGroupId))
                             },
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.spacedBy(8.dp),
                     ) {
-                        Text(displayName ?: "Marmot Group")
-                        if (memberCount > 0) {
-                            Text(
-                                text = "$memberCount members",
-                                style = MaterialTheme.typography.bodySmall,
+                        if (memberPubkeys.isNotEmpty()) {
+                            NonClickableUserPictures(
+                                userHexList = memberPubkeys,
+                                size = 36.dp,
+                                accountViewModel = accountViewModel,
                             )
                         }
+                        Column {
+                            if (!displayName.isNullOrBlank()) {
+                                Text(displayName!!)
+                            } else if (memberPubkeys.isNotEmpty()) {
+                                DisplayUserSetAsSubject(
+                                    userList = memberPubkeys,
+                                    accountViewModel = accountViewModel,
+                                )
+                            } else {
+                                Text("Marmot Group")
+                            }
+                            if (memberCount > 0) {
+                                Text(
+                                    text = "$memberCount members",
+                                    style = MaterialTheme.typography.bodySmall,
+                                )
+                            }
+                        }
                     }
                 },
                 actions = {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/marmotGroup/MarmotGroupListScreen.kt

@@ -64,7 +64,9 @@ import com.vitorpamplona.amethyst.commons.icons.symbols.MaterialSymbols
 import com.vitorpamplona.amethyst.commons.model.marmotGroups.MarmotGroupChatroom
 import com.vitorpamplona.amethyst.ui.navigation.navs.INav
 import com.vitorpamplona.amethyst.ui.navigation.routes.Route
+import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chats.privateDM.header.DisplayUserSetAsSubject
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -178,6 +180,7 @@ fun MarmotGroupListScreen(
                         MarmotGroupListItem(
                             groupId = groupId,
                             chatroom = chatroom,
+                            accountViewModel = accountViewModel,
                             onClick = {
                                 nav.nav(Route.MarmotGroupChat(groupId))
                             },
@@ -212,10 +215,13 @@ private fun loadGroupList(
 fun MarmotGroupListItem(
     groupId: HexKey,
     chatroom: MarmotGroupChatroom,
+    accountViewModel: AccountViewModel,
     onClick: () -> Unit,
 ) {
     val displayName by chatroom.displayName.collectAsStateWithLifecycle()
     val unread by chatroom.unreadCount.collectAsStateWithLifecycle()
+    val members by chatroom.members.collectAsStateWithLifecycle()
+    val memberPubkeys = remember(members) { members.map { it.pubkey } }
     val newestMessage = chatroom.newestMessage
 
     Row(
@@ -224,17 +230,40 @@ fun MarmotGroupListItem(
                 .fillMaxWidth()
                 .clickable(onClick = onClick)
                 .padding(horizontal = 16.dp, vertical = 12.dp),
-        horizontalArrangement = Arrangement.SpaceBetween,
+        horizontalArrangement = Arrangement.spacedBy(12.dp),
         verticalAlignment = Alignment.CenterVertically,
     ) {
-        Column(modifier = Modifier.weight(1f)) {
-            Text(
-                text = displayName ?: "Group ${groupId.take(8)}...",
-                style = MaterialTheme.typography.titleSmall,
-                fontWeight = if (unread > 0) FontWeight.Bold else FontWeight.Normal,
-                maxLines = 1,
-                overflow = TextOverflow.Ellipsis,
+        if (memberPubkeys.isNotEmpty()) {
+            NonClickableUserPictures(
+                userHexList = memberPubkeys,
+                size = 55.dp,
+                accountViewModel = accountViewModel,
             )
+        }
+        Column(modifier = Modifier.weight(1f)) {
+            if (!displayName.isNullOrBlank()) {
+                Text(
+                    text = displayName!!,
+                    style = MaterialTheme.typography.titleSmall,
+                    fontWeight = if (unread > 0) FontWeight.Bold else FontWeight.Normal,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            } else if (memberPubkeys.isNotEmpty()) {
+                DisplayUserSetAsSubject(
+                    userList = memberPubkeys,
+                    accountViewModel = accountViewModel,
+                    fontWeight = if (unread > 0) FontWeight.Bold else FontWeight.Normal,
+                )
+            } else {
+                Text(
+                    text = "Group ${groupId.take(8)}...",
+                    style = MaterialTheme.typography.titleSmall,
+                    fontWeight = if (unread > 0) FontWeight.Bold else FontWeight.Normal,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
+            }
             if (newestMessage != null) {
                 Text(
                     text = newestMessage.event?.content ?: "",

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/header/RoomNameOnlyDisplay.kt

@@ -69,7 +69,15 @@ fun DisplayUserSetAsSubject(
     fontWeight: FontWeight = FontWeight.Bold,
 ) {
     val userList = remember(room) { room.users.toList() }
+    DisplayUserSetAsSubject(userList, accountViewModel, fontWeight)
+}
 
+@Composable
+fun DisplayUserSetAsSubject(
+    userList: List<HexKey>,
+    accountViewModel: AccountViewModel,
+    fontWeight: FontWeight = FontWeight.Bold,
+) {
     if (userList.size == 1) {
         // Regular Design
         Row {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/search/SearchScreen.kt

@@ -216,7 +216,6 @@ private fun hasNonDefaultFilters(
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-@Suppress("AssignedValueIsNeverRead")
 private fun SearchFilterRow(searchBarViewModel: SearchBarViewModel) {
     val currentScope by searchBarViewModel.scope.collectAsStateWithLifecycle()
     val currentSource by searchBarViewModel.source.collectAsStateWithLifecycle()

amethyst/src/main/res/values-cs-rCZ/strings.xml

@@ -2164,4 +2164,66 @@
     <string name="emoji_private_badge">Soukromé emoji</string>
     <string name="emoji_public_explainer">Veřejná emoji jsou viditelná pro všechny a objeví se ve vaší nabídce reakcí a v automatickém doplňování \":\", když je tento balíček ve vašem seznamu emoji.</string>
     <string name="emoji_private_explainer">Soukromá emoji jsou šifrovaně uložena na relayích a viditelná pouze pro vás. Objeví se ve vaší nabídce reakcí a v automatickém doplňování \":\" stejně jako veřejná.</string>
+    <string name="always_on_notif_channel_description">Udržuje připojení k vašim inbox relayím aktivní pro oznámení v reálném čase</string>
+    <string name="always_on_notif_connected">Připojeno k %1$d inbox relayím</string>
+    <string name="always_on_notif_connecting">Připojování k inbox relayím\u2026</string>
+    <string name="always_on_notif_setting_description">Udržuje trvalé připojení k vašim inbox relayím pro okamžité doručování oznámení. Zobrazuje průběžné oznámení. Spotřebovává více baterie, ale zajišťuje, že nezmeškáte žádnou zprávu.</string>
+    <string name="always_on_notif_setting_title">Služba trvalých oznámení</string>
+    <string name="always_on_notif_stop">Pozastavit</string>
+    <string name="always_on_notif_title">Amethyst oznámení aktivní</string>
+    <string name="audio_room_audience">Publikum</string>
+    <string name="audio_room_lower_hand">Dát ruku dolů</string>
+    <string name="audio_room_raise_hand">Přihlásit se</string>
+    <string name="audio_room_stage">Pódium</string>
+    <string name="audio_rooms">Audio místnosti</string>
+    <string name="badge_image_placeholder">https://example.com/badge.png</string>
+    <string name="badge_thumb_placeholder">https://example.com/badge-thumb.png</string>
+    <string name="battery_optimization_description">Android může omezit připojení k relayím na pozadí. Vypněte optimalizaci baterie pro Amethyst, aby byla oznámení spolehlivá.</string>
+    <string name="battery_optimization_fix_now">Opravit</string>
+    <string name="battery_optimization_title">Optimalizace baterie aktivní</string>
+    <string name="bottom_bar_settings">Spodní navigační lišta</string>
+    <string name="bottom_bar_settings_available">Dostupné</string>
+    <string name="bottom_bar_settings_description">Přetažením změníte pořadí. Přepnutím položku přidáte nebo odeberete ze spodní lišty. S nulovým počtem položek bude lišta skryta.</string>
+    <string name="bottom_bar_settings_reorder">Změnit pořadí</string>
+    <string name="drawer_section_create">Vytvořit</string>
+    <string name="drawer_section_feeds">Kanály</string>
+    <string name="drawer_section_navigate">Navigace</string>
+    <string name="drawer_section_system">Systém</string>
+    <string name="drawer_section_you">Vy</string>
+    <string name="emoji_sets">Emoji</string>
+    <string name="follow_packs">Seznamy sledování</string>
+    <string name="live_streams">Živé vysílání</string>
+    <string name="public_chats">Veřejné chaty</string>
+    <string name="search_filters_open">Filtry</string>
+    <string name="search_filters_reset">Obnovit</string>
+    <string name="search_filters_section_sort">Seřadit podle</string>
+    <string name="search_filters_section_source">Zdroj</string>
+    <string name="search_filters_title">Filtry</string>
+    <string name="search_follows_only">Pouze sledovaní</string>
+    <string name="search_scope_all">Vše</string>
+    <string name="search_scope_notes">Poznámky</string>
+    <string name="search_scope_people">Lidé</string>
+    <string name="search_sort_newest">Nejnovější</string>
+    <string name="search_sort_oldest">Nejstarší</string>
+    <string name="search_sort_popular">Populární</string>
+    <string name="search_sort_relevance">Relevance</string>
+    <string name="search_source_local">Lokální</string>
+    <string name="search_source_relays">Relaye</string>
+    <string name="video_player_settings">Tlačítka přehrávače videa</string>
+    <string name="video_player_settings_description">Zvolte, která tlačítka se objeví na přehrávači videa a která budou v nabídce přetečení. Přetažením změníte pořadí.</string>
+    <string name="video_player_settings_reorder">Změnit pořadí</string>
+    <string name="video_player_settings_location_top_bar">Horní lišta</string>
+    <string name="video_player_settings_location_overflow">Nabídka přetečení</string>
+    <string name="video_player_settings_action_fullscreen">Celá obrazovka</string>
+    <string name="video_player_settings_action_fullscreen_description">Otevřít video v zobrazení na celou obrazovku</string>
+    <string name="video_player_settings_action_mute">Ztlumit</string>
+    <string name="video_player_settings_action_mute_description">Zapnout nebo vypnout zvuk</string>
+    <string name="video_player_settings_action_quality">Kvalita videa</string>
+    <string name="video_player_settings_action_quality_description">Vybrat rozlišení pro HLS videa (skryto pro jiná videa)</string>
+    <string name="video_player_settings_action_share">Sdílet nebo uložit</string>
+    <string name="video_player_settings_action_share_description">Sdílet odkaz na video externě</string>
+    <string name="video_player_settings_action_download">Uložit do telefonu</string>
+    <string name="video_player_settings_action_download_description">Stáhnout video do zařízení (skryto u živých vysílání)</string>
+    <string name="video_player_settings_action_pip">Obraz v obraze</string>
+    <string name="video_player_settings_action_pip_description">Přehrávat video v plovoucím okně (skryto, pokud není podporováno)</string>
 </resources>

amethyst/src/main/res/values-de-rDE/strings.xml

@@ -2167,4 +2167,68 @@ anz der Bedingungen ist erforderlich</string>
     <string name="emoji_private_badge">Privates Emoji</string>
     <string name="emoji_public_explainer">Öffentliche Emojis sind für alle sichtbar und erscheinen in deinem Reaktionsmenü und in der \":\"-Autovervollständigungsauswahl, wenn dieses Paket in deiner Emoji-Liste ist.</string>
     <string name="emoji_private_explainer">Private Emojis werden verschlüsselt auf Relays gespeichert und sind nur für dich sichtbar. Sie erscheinen in deinem Reaktionsmenü und in der \":\"-Autovervollständigung wie öffentliche.</string>
+    <string name="always_on_notif_channel_description">Hält Verbindungen zu deinen Inbox-Relays aktiv für Echtzeit-Benachrichtigungen</string>
+    <string name="always_on_notif_connected">Mit %1$d Inbox-Relays verbunden</string>
+    <string name="always_on_notif_connecting">Verbinde mit Inbox-Relays\u2026</string>
+    <string name="always_on_notif_setting_description">Hält eine dauerhafte Verbindung zu deinen Inbox-Relays für sofortige Benachrichtigungen aufrecht. Zeigt eine fortlaufende Benachrichtigung an. Verbraucht mehr Akku, stellt aber sicher, dass du keine Nachricht verpasst.</string>
+    <string name="always_on_notif_setting_title">Dauerhafter Benachrichtigungsdienst</string>
+    <string name="always_on_notif_stop">Pausieren</string>
+    <string name="always_on_notif_title">Amethyst-Benachrichtigungen aktiv</string>
+    <string name="audio_room_audience">Publikum</string>
+    <string name="audio_room_lower_hand">Hand senken</string>
+    <string name="audio_room_raise_hand">Hand heben</string>
+    <string name="audio_room_stage">Bühne</string>
+    <string name="audio_rooms">Audioräume</string>
+    <string name="badge_image_placeholder">https://example.com/badge.png</string>
+    <string name="badge_thumb_placeholder">https://example.com/badge-thumb.png</string>
+    <string name="battery_optimization_description">Android kann Relay-Verbindungen im Hintergrund einschränken. Deaktiviere die Akkuoptimierung für Amethyst, um zuverlässige Benachrichtigungen zu gewährleisten.</string>
+    <string name="battery_optimization_fix_now">Jetzt beheben</string>
+    <string name="battery_optimization_title">Akkuoptimierung aktiv</string>
+    <string name="bottom_bar_settings">Untere Navigationsleiste</string>
+    <string name="bottom_bar_settings_available">Verfügbar</string>
+    <string name="bottom_bar_settings_description">Zum Umordnen ziehen. Zum Hinzufügen oder Entfernen eines Elements aus der unteren Leiste umschalten. Mit null Elementen wird die untere Leiste ausgeblendet.</string>
+    <string name="bottom_bar_settings_reorder">Umordnen</string>
+    <string name="drawer_section_create">Erstellen</string>
+    <string name="drawer_section_feeds">Feeds</string>
+    <string name="drawer_section_navigate">Navigieren</string>
+    <string name="drawer_section_system">System</string>
+    <string name="drawer_section_you">Du</string>
+    <string name="emoji_sets">Emojis</string>
+    <string name="follow_packs">Follow-Pakete</string>
+    <string name="live_streams">Live-Streams</string>
+    <string name="public_chats">Öffentliche Chats</string>
+    <string name="search_filters_open">Filter</string>
+    <string name="search_filters_reset">Zurücksetzen</string>
+    <string name="search_filters_section_sort">Sortieren nach</string>
+    <string name="search_filters_section_source">Quelle</string>
+    <string name="search_filters_title">Filter</string>
+    <string name="search_follows_only">Nur Gefolgte</string>
+    <string name="search_scope_all">Alle</string>
+    <string name="search_scope_notes">Notizen</string>
+    <string name="search_scope_people">Personen</string>
+    <string name="search_sort_newest">Neueste</string>
+    <string name="search_sort_oldest">Älteste</string>
+    <string name="search_sort_popular">Beliebte</string>
+    <string name="search_sort_relevance">Relevanz</string>
+    <string name="search_source_local">Lokal</string>
+    <string name="search_source_relays">Relays</string>
+    <string name="video_player_settings">Videoplayer-Schaltflächen</string>
+    <string name="video_player_settings_description">Wähle, welche Schaltflächen im Videoplayer erscheinen und welche im Überlaufmenü liegen. Zum Umordnen ziehen.</string>
+    <string name="video_player_settings_reorder">Umordnen</string>
+    <string name="video_player_settings_location_top_bar">Obere Leiste</string>
+    <string name="video_player_settings_location_overflow">Überlaufmenü</string>
+    <string name="video_player_settings_action_fullscreen">Vollbild</string>
+    <string name="video_player_settings_action_fullscreen_description">Video in einer Vollbildansicht öffnen</string>
+    <string name="video_player_settings_action_mute">Stumm</string>
+    <string name="video_player_settings_action_mute_description">Ton ein- oder ausschalten</string>
+    <string name="video_player_settings_action_quality">Videoqualität</string>
+    <string name="video_player_settings_action_quality_description">Auflösung für HLS-Videos wählen (bei Nicht-HLS-Videos ausgeblendet)</string>
+    <string name="video_player_settings_action_share">Teilen oder speichern</string>
+    <string name="video_player_settings_action_share_description">Den Videolink extern teilen</string>
+    <string name="video_player_settings_action_download">Auf Telefon speichern</string>
+    <string name="video_player_settings_action_download_description">Video auf dein Gerät herunterladen (bei Live-Streams ausgeblendet)</string>
+    <string name="video_player_settings_action_pip">Bild-in-Bild</string>
+    <string name="video_player_settings_action_pip_description">Video in einem schwebenden Fenster abspielen (ausgeblendet, wenn nicht unterstützt)</string>
+    <string name="badge_name_label">Name</string>
+    <string name="new_community_relays_section">Relays</string>
 </resources>

amethyst/src/main/res/values-pt-rBR/strings.xml

@@ -2161,4 +2161,69 @@
     <string name="emoji_private_badge">Emoji privado</string>
     <string name="emoji_public_explainer">Emojis públicos são visíveis para todos e aparecem no seu menu de reações e no seletor de autocompletar \":\" quando este pacote está na sua lista de emojis.</string>
     <string name="emoji_private_explainer">Emojis privados são armazenados criptografados em relays e visíveis apenas para você. Eles aparecem no seu menu de reações e no autocompletar \":\" assim como os públicos.</string>
+    <string name="always_on_notif_channel_description">Mantém as conexões com seus relays de caixa de entrada ativas para notificações em tempo real</string>
+    <string name="always_on_notif_connected">Conectado a %1$d relays de caixa de entrada</string>
+    <string name="always_on_notif_connecting">Conectando aos relays de caixa de entrada\u2026</string>
+    <string name="always_on_notif_setting_description">Mantém uma conexão persistente com seus relays de caixa de entrada para entrega instantânea de notificações. Mostra uma notificação contínua. Usa mais bateria, mas garante que você nunca perca uma mensagem.</string>
+    <string name="always_on_notif_setting_title">Serviço de notificações sempre ativo</string>
+    <string name="always_on_notif_stop">Pausar</string>
+    <string name="always_on_notif_title">Notificações do Amethyst ativas</string>
+    <string name="audio_room_audience">Plateia</string>
+    <string name="audio_room_lower_hand">Abaixar mão</string>
+    <string name="audio_room_raise_hand">Levantar mão</string>
+    <string name="audio_room_stage">Palco</string>
+    <string name="audio_rooms">Salas de áudio</string>
+    <string name="badge_image_placeholder">https://example.com/badge.png</string>
+    <string name="badge_thumb_placeholder">https://example.com/badge-thumb.png</string>
+    <string name="battery_optimization_description">O Android pode restringir conexões de relay em segundo plano. Desative a otimização de bateria para o Amethyst para garantir notificações confiáveis.</string>
+    <string name="battery_optimization_fix_now">Corrigir agora</string>
+    <string name="battery_optimization_title">Otimização de bateria ativa</string>
+    <string name="bottom_bar_settings">Barra de navegação inferior</string>
+    <string name="bottom_bar_settings_available">Disponíveis</string>
+    <string name="bottom_bar_settings_description">Arraste para reordenar. Alterne para adicionar ou remover um item da barra inferior. Com zero itens, a barra inferior fica oculta.</string>
+    <string name="bottom_bar_settings_reorder">Reordenar</string>
+    <string name="drawer_section_create">Criar</string>
+    <string name="drawer_section_feeds">Feeds</string>
+    <string name="drawer_section_navigate">Navegar</string>
+    <string name="drawer_section_system">Sistema</string>
+    <string name="drawer_section_you">Você</string>
+    <string name="emoji_sets">Emojis</string>
+    <string name="follow_packs">Pacotes de seguidos</string>
+    <string name="live_streams">Transmissões ao vivo</string>
+    <string name="public_chats">Chats públicos</string>
+    <string name="search_filters_open">Filtros</string>
+    <string name="search_filters_reset">Redefinir</string>
+    <string name="search_filters_section_sort">Ordenar por</string>
+    <string name="search_filters_section_source">Fonte</string>
+    <string name="search_filters_title">Filtros</string>
+    <string name="search_follows_only">Apenas seguidos</string>
+    <string name="search_scope_all">Tudo</string>
+    <string name="search_scope_notes">Notas</string>
+    <string name="search_scope_people">Pessoas</string>
+    <string name="search_sort_newest">Mais recentes</string>
+    <string name="search_sort_oldest">Mais antigos</string>
+    <string name="search_sort_popular">Populares</string>
+    <string name="search_sort_relevance">Relevância</string>
+    <string name="search_source_local">Local</string>
+    <string name="search_source_relays">Relays</string>
+    <string name="video_player_settings">Botões do reprodutor de vídeo</string>
+    <string name="video_player_settings_description">Escolha quais botões aparecem no reprodutor de vídeo e quais ficam no menu de transbordo. Arraste para reordenar.</string>
+    <string name="video_player_settings_reorder">Reordenar</string>
+    <string name="video_player_settings_location_top_bar">Barra superior</string>
+    <string name="video_player_settings_location_overflow">Menu de transbordo</string>
+    <string name="video_player_settings_action_fullscreen">Tela cheia</string>
+    <string name="video_player_settings_action_fullscreen_description">Abrir o vídeo em modo tela cheia</string>
+    <string name="video_player_settings_action_mute">Silenciar</string>
+    <string name="video_player_settings_action_mute_description">Ativar ou desativar o áudio</string>
+    <string name="video_player_settings_action_quality">Qualidade do vídeo</string>
+    <string name="video_player_settings_action_quality_description">Escolher uma resolução para vídeos HLS (oculto em vídeos não-HLS)</string>
+    <string name="video_player_settings_action_share">Compartilhar ou salvar</string>
+    <string name="video_player_settings_action_share_description">Compartilhar o link do vídeo externamente</string>
+    <string name="video_player_settings_action_download">Salvar no telefone</string>
+    <string name="video_player_settings_action_download_description">Baixar o vídeo para o dispositivo (oculto em transmissões ao vivo)</string>
+    <string name="video_player_settings_action_pip">Picture-in-Picture</string>
+    <string name="video_player_settings_action_pip_description">Reproduzir o vídeo em uma janela flutuante (oculto se não suportado)</string>
+    <string name="emoji_pack_count">%1$d emojis</string>
+    <string name="interest_set_hashtag_count">%1$d hashtag(s)</string>
+    <string name="new_community_relays_section">Relays</string>
 </resources>

amethyst/src/main/res/values-sv-rSE/strings.xml

@@ -2162,4 +2162,67 @@
     <string name="emoji_private_badge">Privat emoji</string>
     <string name="emoji_public_explainer">Offentliga emojis är synliga för alla och visas i din reaktionsmeny och i \":\"-autokompletteringen när detta paket finns i din emoji-lista.</string>
     <string name="emoji_private_explainer">Privata emojis lagras krypterade på relän och är endast synliga för dig. De visas i din reaktionsmeny och i autokomplettering med \":\" precis som offentliga.</string>
+    <string name="always_on_notif_channel_description">Håller anslutningarna till dina inbox-relän aktiva för realtidsnotifieringar</string>
+    <string name="always_on_notif_connected">Ansluten till %1$d inbox-relän</string>
+    <string name="always_on_notif_connecting">Ansluter till inbox-relän\u2026</string>
+    <string name="always_on_notif_setting_description">Upprätthåller en konstant anslutning till dina inbox-relän för omedelbar leverans av notifieringar. Visar en pågående notifiering. Använder mer batteri men säkerställer att du aldrig missar ett meddelande.</string>
+    <string name="always_on_notif_setting_title">Alltid på-notifieringstjänst</string>
+    <string name="always_on_notif_stop">Pausa</string>
+    <string name="always_on_notif_title">Amethyst-notifieringar aktiva</string>
+    <string name="audio_room_audience">Publik</string>
+    <string name="audio_room_lower_hand">Sänk handen</string>
+    <string name="audio_room_raise_hand">Räck upp handen</string>
+    <string name="audio_room_stage">Scen</string>
+    <string name="audio_rooms">Ljudrum</string>
+    <string name="badge_image_placeholder">https://example.com/badge.png</string>
+    <string name="badge_thumb_placeholder">https://example.com/badge-thumb.png</string>
+    <string name="battery_optimization_description">Android kan begränsa reläanslutningar i bakgrunden. Inaktivera batterioptimering för Amethyst för att säkerställa tillförlitliga notifieringar.</string>
+    <string name="battery_optimization_fix_now">Åtgärda nu</string>
+    <string name="battery_optimization_title">Batterioptimering aktiv</string>
+    <string name="bottom_bar_settings">Nedre navigeringsfält</string>
+    <string name="bottom_bar_settings_available">Tillgängliga</string>
+    <string name="bottom_bar_settings_description">Dra för att ändra ordning. Växla för att lägga till eller ta bort ett objekt från nedre fältet. Med noll objekt döljs det nedre fältet.</string>
+    <string name="bottom_bar_settings_reorder">Ändra ordning</string>
+    <string name="drawer_section_create">Skapa</string>
+    <string name="drawer_section_feeds">Flöden</string>
+    <string name="drawer_section_navigate">Navigera</string>
+    <string name="drawer_section_system">System</string>
+    <string name="drawer_section_you">Du</string>
+    <string name="emoji_sets">Emojis</string>
+    <string name="follow_packs">Följpaket</string>
+    <string name="live_streams">Livesändningar</string>
+    <string name="public_chats">Offentliga chattar</string>
+    <string name="search_filters_open">Filter</string>
+    <string name="search_filters_reset">Återställ</string>
+    <string name="search_filters_section_sort">Sortera efter</string>
+    <string name="search_filters_section_source">Källa</string>
+    <string name="search_filters_title">Filter</string>
+    <string name="search_follows_only">Endast följda</string>
+    <string name="search_scope_all">Alla</string>
+    <string name="search_scope_notes">Anteckningar</string>
+    <string name="search_scope_people">Personer</string>
+    <string name="search_sort_newest">Nyaste</string>
+    <string name="search_sort_oldest">Äldsta</string>
+    <string name="search_sort_popular">Populära</string>
+    <string name="search_sort_relevance">Relevans</string>
+    <string name="search_source_local">Lokalt</string>
+    <string name="search_source_relays">Relän</string>
+    <string name="video_player_settings">Videospelarens knappar</string>
+    <string name="video_player_settings_description">Välj vilka knappar som visas på videospelaren och vilka som finns i överflödsmenyn. Dra för att ändra ordning.</string>
+    <string name="video_player_settings_reorder">Ändra ordning</string>
+    <string name="video_player_settings_location_top_bar">Övre fält</string>
+    <string name="video_player_settings_location_overflow">Överflödsmeny</string>
+    <string name="video_player_settings_action_fullscreen">Helskärm</string>
+    <string name="video_player_settings_action_fullscreen_description">Öppna videon i helskärmsläge</string>
+    <string name="video_player_settings_action_mute">Tyst</string>
+    <string name="video_player_settings_action_mute_description">Slå på eller av ljudet</string>
+    <string name="video_player_settings_action_quality">Videokvalitet</string>
+    <string name="video_player_settings_action_quality_description">Välj en upplösning för HLS-videor (dolt för icke-HLS-videor)</string>
+    <string name="video_player_settings_action_share">Dela eller spara</string>
+    <string name="video_player_settings_action_share_description">Dela videolänken externt</string>
+    <string name="video_player_settings_action_download">Spara på telefonen</string>
+    <string name="video_player_settings_action_download_description">Ladda ner videon till enheten (dolt vid livesändningar)</string>
+    <string name="video_player_settings_action_pip">Bild-i-bild</string>
+    <string name="video_player_settings_action_pip_description">Spela upp videon i ett flytande fönster (dolt om det inte stöds)</string>
+    <string name="emoji_pack_count">%1$d emojis</string>
 </resources>