Merge remote-tracking branch 'origin/bennu' into claude/group-chain-wallet-plan-93f0e1
Every conflict was the curated-lists removal on bennu meeting a wallet line added beside it: the removal is taken and the wallet lines kept. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
cd7aa36cd0
81 files changed
+112
-14627
No files matched your search
@@ -500,129 +500,8 @@
|
||||
<string name="could_not_ask_the_group_to_sign_this_post">Couldn't ask the group to sign this post.</string>
|
||||
<string name="posted_on">Posted %1$s</string>
|
||||
<string name="a_reply">A reply</string>
|
||||
<string name="curated_schemas">Curated schemas</string>
|
||||
<string name="this_group_has_not_published_a_curated_schema_yet">This group hasn't published a curated schema yet. A schema defines a list anyone can suggest entries to and only the group can curate.</string>
|
||||
<!-- The row on the group's screen that opens the schemas. -->
|
||||
<string name="no_schemas_yet">No schemas yet</string>
|
||||
<string name="one_schema">1 schema</string>
|
||||
<string name="n_schemas">%1$s schemas</string>
|
||||
<string name="add_schema">Add schema</string>
|
||||
<string name="edit_schema">Edit schema</string>
|
||||
<string name="propose_schema">Propose schema</string>
|
||||
<string name="fields_colon">Fields: %1$s</string>
|
||||
<!-- The template picker a new schema starts on: curare.to's "Start a list" page, with its four shapes. -->
|
||||
<string name="start_a_list">Start a list</string>
|
||||
<string name="a_list_is_a_schema_what_an_entry_may_contain">A list is a schema: what an entry may contain, who may suggest one, and where it lives. The group signs it with its shared key, and only that key can put an entry on the list.</string>
|
||||
<string name="pick_a_shape_to_start_from">Pick a shape to start from. Everything in it can be changed before the group signs.</string>
|
||||
<string name="template_links">Links & text</string>
|
||||
<string name="template_links_description">Reddit’s default: a title with a link or some text, a picture if you like, and a flair.</string>
|
||||
<string name="template_discussion">Discussion</string>
|
||||
<string name="template_discussion_description">Text posts only: a title and a body, with a flair.</string>
|
||||
<string name="template_catalogue">Catalogue</string>
|
||||
<string name="template_catalogue_description">bitcoin.mov’s shape: things with a year, a type, an external id and links — one entry per thing however often it is suggested.</string>
|
||||
<string name="template_custom">Custom</string>
|
||||
<string name="template_custom_description">Just the two fields every list has — an identifier and a title — and whatever you add.</string>
|
||||
<string name="visibility_public">Public</string>
|
||||
<string name="visibility_closed">Closed</string>
|
||||
<string name="visibility_private">Private</string>
|
||||
<string name="visibility_public_purpose">Anyone may suggest an entry, and anyone may read the list.</string>
|
||||
<string name="visibility_closed_purpose">Only the group and the suggesters below may suggest. Anyone may read the list.</string>
|
||||
<string name="visibility_private_purpose">Only the group and the suggesters below may suggest, and clients show the list to them alone. Relays are open, so this is a convention rather than a secret.</string>
|
||||
<string name="what_an_entry_in_this_list_may_contain">What an entry in this list may contain, and who may suggest one</string>
|
||||
<string name="the_group_signs_a_schema_so_it_takes_a_quorum">The group signs a curated schema, so it takes a quorum. Suggestions reply to it, and only the group can accept them into the list.</string>
|
||||
<string name="this_group_has_no_shared_key_to_sign_a_schema">This group has no shared key, so it cannot sign a curated schema. Run a shared key ceremony first.</string>
|
||||
<string name="could_not_ask_the_group_to_sign_this_schema">Couldn't ask the group to sign this schema.</string>
|
||||
<string name="identifier">Identifier</string>
|
||||
<string name="eg_bitcoin_mov">eg. bitcoin.mov</string>
|
||||
<string name="the_identifier_names_this_list_in_every_reply">The identifier names this list in every reply to it, so it can't change. Add a schema to start another list.</string>
|
||||
<string name="title">Title</string>
|
||||
<string name="eg_bitcoin_mov_suggestion">eg. bitcoin.mov suggestion</string>
|
||||
<string name="description">Description</string>
|
||||
<string name="eg_fields_for_a_bitcoin_mov_entry">eg. Fields for a bitcoin.mov entry: a film, with at least one link to watch it</string>
|
||||
<string name="visibility">Visibility</string>
|
||||
<string name="domain">Domain</string>
|
||||
<string name="eg_example_com">eg. example.com</string>
|
||||
<string name="a_domain_replaces_the_name_wherever_the_list_is_shown">A domain replaces the name wherever the list is shown. It's a claim rather than proof, so only set one the group controls.</string>
|
||||
<string name="fields">Fields</string>
|
||||
<string name="add_field">Add field</string>
|
||||
<string name="required">Required</string>
|
||||
<string name="optional">Optional</string>
|
||||
<string name="derived">Derived</string>
|
||||
<string name="at_least_one_of">At least one of</string>
|
||||
<string name="add_rule">Add rule</string>
|
||||
<string name="pick_two_or_more_fields_at_least_one_of_which_an_entry_must_have">Pick two or more fields, at least one of which an entry must have. A rule with fewer than two is dropped.</string>
|
||||
<string name="suggesters">Suggesters</string>
|
||||
<string name="pubkeys_besides_the_group_that_may_suggest_to_this_list">Pubkeys besides the group that may suggest to this list.</string>
|
||||
<string name="npub_or_hex_pubkey">npub or hex pubkey</string>
|
||||
<string name="add_suggester">Add suggester</string>
|
||||
<string name="that_is_not_a_pubkey">That isn't a pubkey. Paste an npub or 64 hex characters.</string>
|
||||
<string name="that_pubkey_is_already_a_suggester">That pubkey is already a suggester.</string>
|
||||
<string name="where_suggestions_to_this_list_are_published">Where suggestions and entries are published to and read from. Signed into the schema, so a reply can't be sent anywhere else.</string>
|
||||
<string name="no_relays_named_so_a_client_will_pick_its_own">No relays named, so a client will pick its own.</string>
|
||||
<string name="new_field">New field</string>
|
||||
<string name="edit_field">Edit field</string>
|
||||
<string name="field_name">Field name</string>
|
||||
<string name="eg_watchurl">eg. watchUrl</string>
|
||||
<string name="label">Label</string>
|
||||
<string name="eg_watch_reference_url">eg. Watch / reference url</string>
|
||||
<string name="placeholder">Placeholder</string>
|
||||
<string name="eg_https_youtube_com_watch">eg. https://youtube.com/watch?v=…</string>
|
||||
<string name="type">Type</string>
|
||||
<string name="an_entry_must_have_this_field">An entry must have this field</string>
|
||||
<string name="writes_to_tag">Writes to tag</string>
|
||||
<string name="defaults_to_the_field_name_content_means_the_body">Defaults to the field name. "content" means the event's body.</string>
|
||||
<string name="marker">Marker</string>
|
||||
<string name="eg_watch">eg. watch</string>
|
||||
<string name="the_tag_s_third_element_which_tells_fields_sharing_a_tag_apart">The tag's third element, which tells fields sharing a tag apart.</string>
|
||||
<string name="maximum_characters">Maximum characters</string>
|
||||
<string name="maximum_value">Maximum value</string>
|
||||
<string name="minimum_value">Minimum value</string>
|
||||
<string name="options">Options</string>
|
||||
<string name="one_per_line_or_separated_by_commas">One per line, or separated by commas.</string>
|
||||
<string name="https_only">https only</string>
|
||||
<string name="may_appear_more_than_once">May appear more than once</string>
|
||||
<string name="pattern">Pattern</string>
|
||||
<string name="a_regular_expression_the_whole_value_must_match">A regular expression the whole value must match.</string>
|
||||
<string name="filled_in_by_the_app_never_asked_for">Filled in by the app, never asked for</string>
|
||||
<string name="hint">Hint</string>
|
||||
<string name="helper_text_under_the_input">Helper text under the input.</string>
|
||||
<string name="done">Done</string>
|
||||
<string name="remove_field">Remove field</string>
|
||||
<string name="a_field_needs_a_name">A field needs a name.</string>
|
||||
<string name="a_field_name_is_one_word">A field name is one word, with no spaces.</string>
|
||||
<string name="a_field_named_that_already_exists">A field named that already exists.</string>
|
||||
<string name="an_identifier_is_required">An identifier is required.</string>
|
||||
<string name="the_identifier_must_be_at_most_n_characters">The identifier must be at most %1$s characters.</string>
|
||||
<string name="a_title_is_required">A title is required.</string>
|
||||
<string name="the_title_must_be_at_most_n_characters">The title must be at most %1$s characters.</string>
|
||||
<string name="a_name_is_required">A name is required.</string>
|
||||
<string name="the_name_must_be_at_most_n_characters">The name must be at most %1$s characters.</string>
|
||||
<string name="a_description_is_required">A description is required.</string>
|
||||
<string name="the_description_must_be_at_most_n_characters">The description must be at most %1$s characters.</string>
|
||||
<string name="say_who_may_suggest_to_this_list">Say who may suggest to this list.</string>
|
||||
<string name="the_picture_must_be_an_https_url">The picture must be an https url.</string>
|
||||
<string name="that_is_not_a_domain_name">That isn't a domain name.</string>
|
||||
<string name="a_schema_needs_at_least_one_field">A schema needs at least one field.</string>
|
||||
<string name="one_of_the_relays_is_not_a_relay_address">One of the relays isn't a relay address.</string>
|
||||
<string name="eg_2100">eg. 2100</string>
|
||||
<string name="eg_200">eg. 200</string>
|
||||
<string name="eg_1900">eg. 1900</string>
|
||||
<string name="eg_movie_documentary_short">eg. movie, documentary, short</string>
|
||||
<string name="eg_a_za_z_2_8">eg. [A-Za-z]{2,8}</string>
|
||||
<string name="field_type_text">Text</string>
|
||||
<string name="field_type_longtext">Long text</string>
|
||||
<string name="field_type_token">Token</string>
|
||||
<string name="field_type_url">Url</string>
|
||||
<string name="field_type_image">Image</string>
|
||||
<string name="field_type_enum">One of a list</string>
|
||||
<string name="field_type_year">Year</string>
|
||||
<string name="field_type_duration">Duration in seconds</string>
|
||||
<string name="field_type_number">Number</string>
|
||||
<string name="field_type_date">Date</string>
|
||||
<string name="latest_year">Latest year</string>
|
||||
<string name="earliest_year">Earliest year</string>
|
||||
<string name="propose_event">Propose event</string>
|
||||
<string name="paste_an_unsigned_event_for_the_group_to_sign">Paste an unsigned Nostr event for the group to sign. It is filed by kind: a profile (kind 0), a post (kind 1), a relay list, or a curated schema (kind 31889).</string>
|
||||
<string name="paste_an_unsigned_event_for_the_group_to_sign">Paste an unsigned Nostr event for the group to sign. It is filed by kind: a profile (kind 0), a post (kind 1) or a relay list.</string>
|
||||
<string name="the_group_signs_an_event_so_it_takes_a_quorum">The group signs it, so it takes a quorum. The author is the group and the time is now, whatever the paste says about either.</string>
|
||||
<string name="this_group_has_no_shared_key_to_sign_an_event">This group has no shared key, so it cannot sign an event. Run a shared key ceremony first.</string>
|
||||
<string name="could_not_ask_the_group_to_sign_this_event">Couldn't ask the group to sign this event.</string>
|
||||
@@ -637,61 +516,7 @@
|
||||
<string name="tags_must_be_a_list_of_lists_of_strings">Tags must be a list of lists of strings.</string>
|
||||
<string name="content_must_be_text">Content must be text.</string>
|
||||
<string name="the_content_is_not_a_profile">The content isn't a profile. A kind 0 carries a JSON object of profile fields.</string>
|
||||
<string name="this_schema_cannot_be_signed_as_it_is">This schema can't be signed as it is:</string>
|
||||
<string name="view_suggestions">View suggestions</string>
|
||||
<string name="suggestions">Suggestions</string>
|
||||
<string name="everything_anyone_has_suggested_to_this_list">Everything anyone has suggested to this list, newest first. Only the group can take one up into the list.</string>
|
||||
<string name="one_suggestion">1 suggestion</string>
|
||||
<string name="n_suggestions">%1$s suggestions</string>
|
||||
<string name="n_curated">%1$s curated</string>
|
||||
<string name="read_from_relays">Read from %1$s</string>
|
||||
<string name="asking_the_list_s_relays">Asking the list's relays…</string>
|
||||
<string name="nobody_has_suggested_anything_to_this_list_yet">Nobody has suggested anything to this list yet.</string>
|
||||
<string name="ask_again">Ask again</string>
|
||||
<string name="curated">Curated</string>
|
||||
<string name="suggested_by_on">Suggested by %1$s on %2$s</string>
|
||||
<string name="taken_up_by_the_group_into_the_list">Taken up by the group into the list.</string>
|
||||
<string name="accept_this_suggestion">Accept this suggestion</string>
|
||||
<string name="revise_the_list_s_entry">Revise the list's entry</string>
|
||||
<!-- Taking one suggestion into a list the group curates: the form, and the entry it proposes. -->
|
||||
<string name="take_this_suggestion_into_the_list">Take this suggestion into %1$s, edited as the group wants it. The entry keeps the suggestion's identifier and points back at it, so the suggester is credited.</string>
|
||||
<string name="the_group_signs_an_entry_so_it_takes_a_quorum">The group signs an entry, so it takes a quorum. Nothing changes until one has.</string>
|
||||
<string name="this_group_has_no_shared_key_to_sign_an_entry">This group has no shared key, so it cannot sign an entry. Run a shared key ceremony first.</string>
|
||||
<string name="the_group_already_has_an_entry_for_this">The group already has an entry for this. Proposing again revises it in place rather than adding a second one.</string>
|
||||
<string name="propose_entry">Propose entry</string>
|
||||
<string name="could_not_ask_the_group_to_sign_this_entry">Couldn't ask the group to sign this entry. Please try again.</string>
|
||||
<string name="this_entry_cannot_be_signed_as_it_is">This entry can't be signed as it is:</string>
|
||||
<string name="the_entry_cannot_be_signed_as_it_is">The entry can't be signed as it is.</string>
|
||||
<string name="kept_from_the_suggestion">Kept from the suggestion</string>
|
||||
<string name="filled_in_by_the_suggester_s_app_and_kept">Filled in by the suggester's app and kept as they came, the identifier among them, so that an entry accepted twice lands on the same coordinate.</string>
|
||||
<string name="add_another">Add another</string>
|
||||
<string name="this_field_is_required">This field is required.</string>
|
||||
<string name="only_one_value_for_this_field">Only one value for this field.</string>
|
||||
<string name="one_word_without_spaces">One word, without spaces.</string>
|
||||
<string name="that_is_not_a_web_address">That is not a web address.</string>
|
||||
<string name="that_must_be_an_https_address">That must be an https address.</string>
|
||||
<string name="pick_one_of_the_options">Pick one of the options.</string>
|
||||
<string name="a_whole_number">A whole number.</string>
|
||||
<string name="more_than_zero">More than zero.</string>
|
||||
<string name="a_date_as_yyyy_yyyy_mm_or_yyyy_mm_dd">A date, as YYYY, YYYY-MM or YYYY-MM-DD.</string>
|
||||
<string name="at_least_n">At least %1$s.</string>
|
||||
<string name="at_most_n">At most %1$s.</string>
|
||||
<string name="n_or_later">%1$s or later.</string>
|
||||
<string name="n_or_earlier">%1$s or earlier.</string>
|
||||
<string name="this_list_uses_a_field_type_this_app_does_not_support">This list uses a field type this app doesn't support (%1$s).</string>
|
||||
<string name="at_most_n_characters">At most %1$s characters.</string>
|
||||
<string name="must_match_the_pattern">Must match %1$s.</string>
|
||||
<string name="at_least_one_of_these_is_needed">At least one of these is needed: %1$s.</string>
|
||||
<string name="field_and_problem">%1$s: %2$s</string>
|
||||
<!-- The group's screen: the entries it has accepted into the lists it curates. -->
|
||||
<string name="curated_entries">Curated entries</string>
|
||||
<string name="this_group_has_not_accepted_anything_into_a_list_yet">This group hasn't accepted anything into a list yet. An entry a quorum signs is shown here, and reaches the list's readers once it is broadcast.</string>
|
||||
<!-- The row on the group's screen that opens the entries. -->
|
||||
<string name="no_entries_yet">No entries yet</string>
|
||||
<string name="one_entry">1 entry</string>
|
||||
<string name="n_entries">%1$s entries</string>
|
||||
<string name="in_list">In %1$s</string>
|
||||
<string name="suggested_by">Suggested by %1$s</string>
|
||||
<!-- Broadcasting one event the group signed to relays a member picks. -->
|
||||
<string name="broadcast">Broadcast</string>
|
||||
<string name="sends_the_event_exactly_as_the_group_signed_it">Sends the event to each relay below, exactly as the group signed it. Any member holding it can send it: the signature is the group's, not yours.</string>
|
||||
@@ -706,12 +531,6 @@
|
||||
<string name="accepted_by_n_of_m_relays">Accepted by %1$s of %2$s relays.</string>
|
||||
<string name="copy_raw_json">Copy raw JSON</string>
|
||||
<string name="copied_the_raw_json">Copied the raw JSON</string>
|
||||
<!-- Broadcasting every entry the group has accepted at once, each to where its own broadcast would go. -->
|
||||
<string name="broadcast_all">Broadcast all</string>
|
||||
<string name="sending_entry_n_of_m">Sending entry %1$s of %2$s…</string>
|
||||
<string name="accepted_by_every_relay_for_n_of_m_entries">Accepted by every relay for %1$s of %2$s entries.</string>
|
||||
<string name="no_relays_to_send_it_to">No relays to send it to: every relay the group named is blocked.</string>
|
||||
<string name="relay_and_answer">%1$s · %2$s</string>
|
||||
<!-- Sign in: docs/nsec-sign-in.md, phase 4. -->
|
||||
<string name="a_password_protected_key_ncryptsec_is_not">A password-protected key (ncryptsec) is not supported yet. Decrypt it in the app it came from and paste the nsec.</string>
|
||||
<string name="enter_a_recovery_phrase_or_an_nsec_to_sign_in">Enter a recovery phrase or an nsec to sign in.</string>
|
||||
|
||||
Reference in new issue
Block a user