Merge upstream, cont'd.

2025-01-28 10:18:03 +01:00
parent 8ca827a816 3e1e3e80fb
commit 467b8d4184
716 changed files with 14047 additions and 7995 deletions
@@ -377,6 +377,8 @@
    <string name="add_caption">Add a Caption</string>
    <string name="add_caption_example">My lovely friend</string>

+    <string name="use_direct_url">Use direct URL</string>
+
    <string name="content_description">Description of the contents</string>
    <string name="content_description_example">A blue boat in a white sandy beach at sunset</string>

@@ -978,6 +980,7 @@
    <string name="search_relays_not_found_editing">Insert between 1–3 relays to use when searching for content or tagging users. Make sure your chosen relays implement NIP-50</string>
    <string name="search_relays_not_found_examples">Good options are:\n - nostr.wine\n - relay.nostr.band\n - relay.noswhere.com</string>

+    <string name="dm_upload">DM Upload</string>
    <string name="relay_settings">Relay Settings</string>
    <string name="public_home_section">Public Outbox/Home Relays</string>
    <string name="public_home_section_explainer">This relay type stores all your content. Amethyst will send your posts here and others will use these relays to find your content. Insert between 1–3 relays. They can be personal relays, paid relays or public relays.</string>