Merge branch 'vitorpamplona:main' into labeled-bookmarks

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterAccountInfoAndListsFromKey.kt

@@ -21,6 +21,7 @@
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.metadata
 
 import com.vitorpamplona.amethyst.model.nip78AppSpecific.AppSpecificState.Companion.APP_SPECIFIC_DATA_D_TAG
+import com.vitorpamplona.quartz.experimental.trustedAssertions.list.TrustProviderListEvent
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
@@ -65,6 +66,7 @@ val AccountInfoAndListsFromKeyKinds2 =
         ProxyRelayListEvent.KIND,
         HashtagListEvent.KIND,
         GeohashListEvent.KIND,
+        TrustProviderListEvent.KIND,
     )
 
 val AmethystMetadataKinds = listOf(AppSpecificDataEvent.KIND)

amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/reqCommand/account/metadata/FilterBasicAccountInfoFromKeys.kt

@@ -20,6 +20,7 @@
  */
 package com.vitorpamplona.amethyst.service.relayClient.reqCommand.account.metadata
 
+import com.vitorpamplona.quartz.experimental.trustedAssertions.list.TrustProviderListEvent
 import com.vitorpamplona.quartz.nip01Core.core.HexKey
 import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
 import com.vitorpamplona.quartz.nip01Core.relay.client.pool.RelayBasedFilter
@@ -59,6 +60,7 @@ val BasicAccountInfoKinds2 =
         ProxyRelayListEvent.KIND,
         HashtagListEvent.KIND,
         GeohashListEvent.KIND,
+        TrustProviderListEvent.KIND,
     )
 
 fun filterBasicAccountInfoFromKeys(

amethyst/src/main/res/values-lv-rLV/strings.xml

@@ -16,6 +16,7 @@
     <string name="malware">Ļaunprogrammatūra</string>
     <string name="view_count">Skatījumi</string>
     <string name="edited">rediģēts</string>
+    <string name="quote">Citāts</string>
     <string name="add">Pievienot</string>
     <string name="and">" un "</string>
     <string name="following">" Seko"</string>

amethyst/src/main/res/values-pl-rPL/strings.xml

@@ -231,7 +231,7 @@
     <string name="description_to">opis dla</string>
     <string name="and_picture_to">i zdjęcie do</string>
     <string name="leave">Wyjdź</string>
-    <string name="unfollow">Porzuć obserwację</string>
+    <string name="unfollow">Nie obserwuj</string>
     <string name="channel_created">Kanał utworzony</string>
     <string name="channel_information_changed_to">"Informacje o kanale zmienione na"</string>
     <string name="ephemeral_relay_chat">Czat efemeryczny</string>

amethyst/src/main/res/values-zh-rCN/strings.xml

@@ -347,6 +347,7 @@
     <string name="report_dialog_post_report_btn">发布举报</string>
     <string name="report_dialog_title">阻止与举报</string>
     <string name="block_only">仅阻止</string>
+    <string name="manual_zaps">手动 Zap 拆分</string>
     <string name="bookmarks">书签</string>
     <string name="drafts">草稿</string>
     <string name="private_bookmarks">私人书签</string>