Merge branch 'bennu' into claude/remove-nostr-relays-posts-fc5580

# Conflicts:
#	composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/model/ChatMessage.kt
#	composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/database/repository/DatabaseChatRepository.kt
#	composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/nostr/wallet/GroupWallet.kt
#	composeApp/src/commonMain/kotlin/com/machankura/bennu/compose/repository/ChatRepository.kt
This commit is contained in:
Kgothatso Ngako committed 2026-10-23 18:28:25 +02:00
commit 79f2ec3d4d
56 files changed
+8989 -192

No files matched your search

@@ -463,6 +463,20 @@
<string name="opening_a_wallet_asks_the_group_to_agree">Opening a wallet asks the group to agree that it keeps coins here. Any quorum of members can then spend them together, and nobody can spend them alone.</string>
<string name="each_member_s_share_is_stored_unencrypted">Each member's share of the group's key is stored unencrypted on their device. Anyone with an unlocked device, or a copy of its data, holds that member's share.</string>
<string name="couldn_t_ask_the_group_to_open_a_wallet">Couldn't ask the group to open a wallet.</string>
<string name="the_groups_above_this_one_have_agreed_to_guard_it">The groups above this one have agreed to guard its wallet. In a guarded wallet each of them can spend any coin once it has %1$d confirmations, without this group agreeing.</string>
<string name="open_a_guarded_wallet">Open a guarded wallet</string>
<string name="open_without_guardians">Open without guardians</string>
<string name="guarded_wallets">Guarded wallets</string>
<string name="spend">Spend</string>
<string name="spend_from_s_s_guarded_wallet">Spend from %1$s's guarded wallet</string>
<string name="wallets_of_groups_below_this_one">Wallets of groups below this one. This group can spend a coin in them once it has %1$d confirmations.</string>
<string name="s_sats_within_this_group_s_reach">%1$s sats within this group's reach</string>
<string name="tell_the_groups_above">Tell the groups above</string>
<string name="not_yet_shared_with_the_groups_above">Not yet shared with the groups above that you're in</string>
<string name="share">Share</string>
<string name="shared_with_the_groups_above">Shared with the groups above</string>
<string name="couldn_t_share_the_wallet">Couldn't share the wallet</string>
<string name="guarded_the_groups_above_this_one_can_spend">Guarded: the groups above this one can spend any coin here once it has %1$d confirmations.</string>
<string name="balance">Balance</string>
<string name="s_sats">%1$s sats</string>
<string name="s_sats_on_the_way">%1$s sats on the way</string>
@@ -527,7 +541,7 @@
<string name="signed_sending_it_to_the_network">Signed, sending it to the network</string>
<string name="sent_waiting_for_a_confirmation">Sent, waiting for a confirmation</string>
<string name="confirmed">Confirmed</string>
<string name="replaced_by_a_later_spend">Replaced by a later spend</string>
<string name="replaced_by_a_later_spend">Replaced by another spend of the same coins</string>
<string name="send_again">Send again</string>
<string name="bump_the_fee">Bump the fee</string>
<string name="sent_again">Sent again</string>