diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 6a1c63b921..31f9b5ecba 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -411,7 +411,9 @@
   "collections.sensitive": "Inhaltswarnung",
   "collections.share_short": "Teilen",
   "collections.suggestions.can_not_add": "Kann nicht hinzugefügt werden",
+  "collections.suggestions.can_not_add_desc": "Diese Konten möchten möglicherweise nicht entdeckt werden oder deren Server unterstützt noch keine Sammlungen.",
   "collections.suggestions.must_follow": "Zuerst Profil folgen",
+  "collections.suggestions.must_follow_desc": "Diese Konten überprüfen ihre Follower-Anfragen manuell. Follower können sie zu Sammlungen hinzufügen.",
   "collections.topic_hint": "Ein Hashtag für diese Sammlung kann anderen dabei helfen, dein Anliegen besser einordnen zu können.",
   "collections.topic_special_chars_hint": "Sonderzeichen werden beim Speichern entfernt",
   "collections.unlisted_collections_description": "Die Sammlungen sind für andere nicht auf deinem Profil sichtbar. Ein direkter Zugriff ist per Link möglich.",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 3e0a48c7cc..863cb4f03c 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -666,7 +666,7 @@
   "featured_carousel.header": "{count, plural, one {Καρφιτσωμένη Ανάρτηση} other {Καρφιτσωμένες Αναρτήσεις}}",
   "featured_carousel.slide": "Ανάρτηση {current, number} από {max, number}",
   "featured_tags.more_items": "+{count}",
-  "featured_tags.suggestions": "Τον τελευταίο καιρό έχετε δημοσιεύσει για {items}. Προσθέστε αυτά ως αναδεδειγμένες ετικέτες;",
+  "featured_tags.suggestions": "Τον τελευταίο καιρό έχεις δημοσιεύσει για {items}. Να προστεθούν αυτά ως αναδεδειγμένες ετικέτες;",
   "featured_tags.suggestions.add": "Προσθήκη",
   "featured_tags.suggestions.added": "Διαχειριστείτε τις αναδεδειγμένες ετικέτες σας οποιαδήποτε στιγμή κάτω από το <link>Επεξεργασία προφίλ > Αναδεδειγμένες ετικέτες</link>.",
   "featured_tags.suggestions.dismiss": "Όχι, ευχαριστώ",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 43330f176e..0718725951 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -106,6 +106,7 @@
   "account.name.copy": "Copy handle",
   "account.name.help.domain": "{domain} is the server that hosts the user’s profile and posts.",
   "account.name.help.domain_self": "{domain} is your server that hosts your profile and posts.",
+  "account.name.help.footer": "Just like you can send emails to people using different email providers, you can interact with people on other Mastodon servers, and with anyone on other Mastodon-compatible social apps.",
   "account.name.help.header": "A handle is like an email address",
   "account.name.help.username": "{username} is this account’s username on their server. Someone on another server might have the same username.",
   "account.name.help.username_self": "{username} is your username on this server. Someone on another server might have the same username.",
@@ -350,6 +351,7 @@
   "closed_registrations_modal.find_another_server": "Find another server",
   "closed_registrations_modal.preamble": "Mastodon is decentralised, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
   "closed_registrations_modal.title": "Signing up on Mastodon",
+  "collection.share_modal.share_link_label": "Share link",
   "collection.share_modal.share_via_post": "Post on Mastodon",
   "collection.share_modal.share_via_system": "Share to…",
   "collection.share_modal.title": "Share collection",
@@ -357,7 +359,10 @@
   "collection.share_template_other": "Check out this cool collection: {link}",
   "collection.share_template_own": "Check out my new collection: {link}",
   "collections.account_count": "{count, plural, one {# account} other {# accounts}}",
+  "collections.accounts.empty_description": "Add up to {count} accounts",
+  "collections.accounts.empty_editor_title": "No one is in this collection yet",
   "collections.accounts.empty_title": "This collection is empty",
+  "collections.block_collection_owner": "Block account",
   "collections.by_account": "Delete",
   "collections.collection_description": "Description",
   "collections.collection_language": "Language",
@@ -367,6 +372,8 @@
   "collections.confirm_account_removal": "Are you sure you want to remove this account from this collection?",
   "collections.content_warning": "Content warning",
   "collections.continue": "Continue",
+  "collections.copy_link": "Copy link",
+  "collections.copy_link_confirmation": "Copied collection link to clipboard",
   "collections.create.accounts_title": "Who will you feature in this collection?",
   "collections.create.basic_details_title": "Basic details",
   "collections.create.steps": "Step {step}/{total}",
@@ -384,6 +391,9 @@
   "collections.detail.you_are_in_this_collection": "You're featured in this collection",
   "collections.edit_details": "Edit details",
   "collections.error_loading_collections": "There was an error when trying to load your collections.",
+  "collections.hidden_accounts_description": "You’ve blocked or muted {count, plural, one {this user} other {these users}}",
+  "collections.hidden_accounts_link": "{count, plural, one {# hidden account} other {# hidden accounts}}",
+  "collections.hints.accounts_counter": "{count}/{max} accounts",
   "collections.last_updated_at": "Last updated: {date}",
   "collections.manage_accounts": "Manage accounts",
   "collections.mark_as_sensitive": "Mark as sensitive",
@@ -391,14 +401,23 @@
   "collections.name_length_hint": "40 characters limit",
   "collections.new_collection": "New collection",
   "collections.no_collections_yet": "No collections yet.",
+  "collections.remove_account": "Remove",
   "collections.report_collection": "Report this collection",
   "collections.revoke_collection_inclusion": "Remove myself from this collection",
   "collections.revoke_inclusion.confirmation": "You've been removed from \"{collection}\"",
   "collections.revoke_inclusion.error": "There was an error, please try again later.",
+  "collections.search_accounts_label": "Search for an account to add",
   "collections.search_accounts_max_reached": "You have added the maximum number of accounts",
   "collections.sensitive": "Sensitive",
+  "collections.share_short": "Share",
+  "collections.suggestions.can_not_add": "Can’t be added",
+  "collections.suggestions.can_not_add_desc": "These accounts may have opted out of discovery, or they might be on a server that doesn’t support collections.",
+  "collections.suggestions.must_follow": "Must follow first",
+  "collections.suggestions.must_follow_desc": "These accounts review all follow requests. Followers can add them to collections.",
   "collections.topic_hint": "Add a hashtag that helps others understand the main topic of this collection.",
   "collections.topic_special_chars_hint": "Special characters will be removed when saving",
+  "collections.unlisted_collections_description": "These don’t appear on your profile to others. Anyone with the link can discover them.",
+  "collections.unlisted_collections_with_count": "Unlisted collections ({count})",
   "collections.view_collection": "View collection",
   "collections.visibility_public": "Public",
   "collections.visibility_public_hint": "Discoverable in search results and other areas where recommendations appear.",
@@ -891,6 +910,7 @@
   "navigation_panel.expand_followed_tags": "Expand followed hashtags menu",
   "navigation_panel.expand_lists": "Expand list menu",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
+  "notification.added_to_collection": "{name} added you to a collection",
   "notification.admin.report": "{name} reported {target}",
   "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
   "notification.admin.report_account_other": "{name} reported {count, plural, one {one post} other {# posts}} from {target}",
@@ -900,6 +920,7 @@
   "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
   "notification.annual_report.message": "Your {year} #Wrapstodon awaits! Unveil your year's highlights and memorable moments on Mastodon!",
   "notification.annual_report.view": "View #Wrapstodon",
+  "notification.collection_update": "{name} edited a collection you’re in",
   "notification.favourite": "{name} favourited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your post",
   "notification.favourite_pm": "{name} favourited your private mention",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 5c79bccfae..b70fc916c0 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -141,8 +141,8 @@
   "account.unmute_notifications_short": "Lõpeta teavituste summutamine",
   "account.unmute_short": "Lõpeta summutamine",
   "account_edit.advanced_settings.bot_hint": "Teavita teisi, et sel kontol tehakse peamiselt automatiseeritud toiminguid ja seda ei pruugita jälgida",
-  "account_edit.advanced_settings.bot_label": "Automatiseeritud konto",
-  "account_edit.advanced_settings.title": "Täpsemad seaded",
+  "account_edit.advanced_settings.bot_label": "Automatiseeritud kasutajakonto",
+  "account_edit.advanced_settings.title": "Täpsemad seadistused",
   "account_edit.bio.add_label": "Lisa elulugu",
   "account_edit.bio.edit_label": "Muuda elulugu",
   "account_edit.bio.placeholder": "Lisa lühike tutvustus, et aidata teistel sinust pilti luua.",
@@ -158,7 +158,7 @@
   "account_edit.custom_fields.tip_content": "Saad Mastodoni konto usaldusväärsust hõlpsasti suurendada, kinnitades lingid lehtedele, mis sulle kuuluvad.",
   "account_edit.custom_fields.tip_title": "Soovitus: Kinnitatud linkide lisamine",
   "account_edit.custom_fields.title": "Kohandatud väljad",
-  "account_edit.custom_fields.verified_hint": "Kuidas lisada kinnitatud link?",
+  "account_edit.custom_fields.verified_hint": "Kuidas lisada kinnitatud linki?",
   "account_edit.display_name.add_label": "Lisa kuvatav nimi",
   "account_edit.display_name.edit_label": "Muuda kuvatavat nime",
   "account_edit.display_name.placeholder": "Kuvatav nimi määrab, kuidas sinu nimi on näha sinu profiilis ja ajajoontel.",
@@ -170,7 +170,7 @@
   "account_edit.field_actions.edit": "Muuda välja",
   "account_edit.field_delete_modal.confirm": "Kas oled kindel, et soovid selle kohandatud välja kustutada? Seda toimingut ei saa tagasi võtta.",
   "account_edit.field_delete_modal.delete_button": "Kustuta",
-  "account_edit.field_delete_modal.title": "Kustutada kohandatud väli?",
+  "account_edit.field_delete_modal.title": "Kas kustutame kohandatud välja?",
   "account_edit.field_edit_modal.add_title": "Lisa kohandatud väli",
   "account_edit.field_edit_modal.discard_confirm": "Loobu",
   "account_edit.field_edit_modal.discard_message": "Sul on salvestamata muudatusi. Kas soovid tõesti neist loobuda?",
@@ -211,14 +211,14 @@
   "account_edit.profile_tab.button_label": "Kohanda",
   "account_edit.profile_tab.hint.description": "Need seaded määravad, mida kasutajad näevad {server} ametlikes rakendustes, kuid ei pruugi kehtida teiste serverite kasutajate ja kolmandate osapoolte rakenduste puhul.",
   "account_edit.profile_tab.hint.title": "Näitamine siiski erinev",
-  "account_edit.profile_tab.show_featured.description": "\"Esile tõstetud\" on valikuline taab, kus saad näidata teisi kontosid.",
-  "account_edit.profile_tab.show_featured.title": "Näita esiletõstetute taabi",
-  "account_edit.profile_tab.show_media.description": "\"Meedia\" on valikuline taab, mis näitab sinu piltide või videotega postitusi.",
-  "account_edit.profile_tab.show_media.title": "Näita meedia taabi",
-  "account_edit.profile_tab.show_media_replies.description": "Sisse lülitatuna näitab meedia taab mõlemat, nii sinu postitusi kui su vastuseid teiste postitustele.",
-  "account_edit.profile_tab.show_media_replies.title": "Kaasa meedia taabile ka vastused",
+  "account_edit.profile_tab.show_featured.description": "„Esiletõstetud“ on valikuline vahekaart, kus saad näidata teisi kontosid.",
+  "account_edit.profile_tab.show_featured.title": "Näita vahekaarti „Esiletõstetud“",
+  "account_edit.profile_tab.show_media.description": "„Meedium“ on valikuline vahekaart, mis näitab sinu piltide või videotega postitusi.",
+  "account_edit.profile_tab.show_media.title": "Näita multimeedia vahekaarti",
+  "account_edit.profile_tab.show_media_replies.description": "Sisselülitatuna näitab mediumi vahekaart, nii sinu postitusi kui su vastuseid teiste kasutajate postitustele.",
+  "account_edit.profile_tab.show_media_replies.title": "Kaasa vahekaardile „Meedium“ ka vastused",
   "account_edit.profile_tab.subtitle": "Kohanda oma profiili vahekaarte ja nende sisu.",
-  "account_edit.profile_tab.title": "Profiili taabide seaded",
+  "account_edit.profile_tab.title": "Profiili vahekaartide seadistused",
   "account_edit.save": "Salvesta",
   "account_edit.upload_modal.back": "Tagasi",
   "account_edit.upload_modal.done": "Valmis",
@@ -511,10 +511,10 @@
   "confirmations.follow_to_list.confirm": "Jälgi ja lisa loetellu",
   "confirmations.follow_to_list.message": "Pead jälgima kasutajat {name}, et lisada teda loetellu.",
   "confirmations.follow_to_list.title": "Jälgida kasutajat?",
-  "confirmations.hide_featured_tab.confirm": "Peida taab",
+  "confirmations.hide_featured_tab.confirm": "Peida vahekaart",
   "confirmations.hide_featured_tab.intro": "Saad seda igal ajal muuta menüüs <i>Profiili muutmine > Profiili vahekaardi seaded</i>.",
   "confirmations.hide_featured_tab.message": "See peidab vahekaardi serveri {serverName} kasutajatel ja teistel serveritel, kus kasutatakse Mastodoni uusimat versiooni. Muudel serveritel võib kuvamine erineda.",
-  "confirmations.hide_featured_tab.title": "Peita taab Esiletõstetud?",
+  "confirmations.hide_featured_tab.title": "Kas peidame vahekaardi „Esiletõstetud“?",
   "confirmations.logout.confirm": "Välju",
   "confirmations.logout.message": "Kas oled kindel, et soovid välja logida?",
   "confirmations.logout.title": "Logida välja?",
@@ -621,7 +621,7 @@
   "emoji_button.travel": "Reisimine & kohad",
   "empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud.",
   "empty_column.account_featured_self.no_collections_button": "Loo kogumik",
-  "empty_column.account_featured_self.no_collections_hide_tab": "Selle asemel peida see taab",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Selle asemel peida see vahekaart",
   "empty_column.account_featured_self.pre_collections": "Jälgi kogumikke",
   "empty_column.account_featured_self.pre_collections_desc": "Kogumikud (lisanduvad Mastodon V4.6) võimaldavad sul luua enda koostatud kontode nimekirju, mida teistele soovitada.",
   "empty_column.account_featured_self.showcase_accounts": "Näita oma lemmikkontosid",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index e03bfdca29..30fab0f1bf 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -64,6 +64,7 @@
   "account.media": "Multivide",
   "account.mention": "Pieminēt @{name}",
   "account.menu.block": "Bloķēt kontu",
+  "account.menu.copy": "Kopēt saiti",
   "account.moved_to": "{name} norādīja, ka viņu jaunais konts tagad ir:",
   "account.mute": "Apklusināt @{name}",
   "account.mute_notifications_short": "Apklusināt paziņojumus",
@@ -71,8 +72,10 @@
   "account.muted": "Apklusināts",
   "account.muting": "Apklusināts",
   "account.mutual": "Jūs sekojat viens otram",
+  "account.name_info": "Ko tas nozīmē?",
   "account.no_bio": "Apraksts nav sniegts.",
   "account.node_modal.save": "Saglabāt",
+  "account.note.edit_button": "Labot",
   "account.open_original_page": "Atvērt pirmavota lapu",
   "account.posts": "Ieraksti",
   "account.remove_from_followers": "Dzēst sekotāju {name}",
@@ -91,6 +94,7 @@
   "account.unmute": "Noņemt apklusinājumu @{name}",
   "account.unmute_notifications_short": "Atcelet paziņojumu apklusināšanu",
   "account.unmute_short": "Noņemt apklusinājumu",
+  "account_edit.bio.edit_label": "Labot biogrāfiju",
   "account_edit.bio.title": "Biogrāfija",
   "account_edit.bio_modal.add_title": "Pievienot biogrāfiju",
   "account_edit.bio_modal.edit_title": "Labot biogrāfiju",
@@ -98,8 +102,23 @@
   "account_edit.column_title": "Labot profilu",
   "account_edit.custom_fields.add_label": "Pievienot lauku",
   "account_edit.custom_fields.edit_label": "Labot lauku",
+  "account_edit.field_actions.delete": "Dzēst lauku",
+  "account_edit.field_actions.edit": "Labot lauku",
   "account_edit.field_delete_modal.delete_button": "Dzēst",
   "account_edit.field_edit_modal.discard_confirm": "Atmest",
+  "account_edit.image_delete_modal.delete_button": "Dzēst",
+  "account_edit.image_delete_modal.title": "Dzēst attēlu?",
+  "account_edit.image_edit.add_button": "Pievienot attēlu",
+  "account_edit.image_edit.remove_button": "Noņemt attēlu",
+  "account_edit.save": "Saglabāt",
+  "account_edit.upload_modal.back": "Atpakaļ",
+  "account_edit.upload_modal.done": "Gatavs",
+  "account_edit.upload_modal.step_upload.button": "Pārlūkot failus",
+  "account_edit.upload_modal.title_add.avatar": "Pievienot profila fotoattēlu",
+  "account_edit.upload_modal.title_add.header": "Pievienot titullapas fotoattēlu",
+  "account_edit.upload_modal.title_replace.avatar": "Nomainīt profila fotoattēlu",
+  "account_edit.upload_modal.title_replace.header": "Nomainīt titullapas fotoattēlu",
+  "account_edit_tags.suggestions": "Ieteikumi:",
   "account_note.placeholder": "Noklikšķini, lai pievienotu piezīmi",
   "admin.dashboard.daily_retention": "Lietotāju saglabāšanas rādītājs dienā pēc reģistrēšanās",
   "admin.dashboard.monthly_retention": "Lietotāju saglabāšanas rādītājs mēnesī pēc reģistrēšanās",
@@ -123,6 +142,11 @@
   "alt_text_modal.describe_for_people_with_visual_impairments": "Aprakstīt šo cilvēkiem ar redzes traucējumiem…",
   "alt_text_modal.done": "Gatavs",
   "announcement.announcement": "Paziņojums",
+  "annual_report.shared_page.donate": "Ziedot",
+  "annual_report.summary.archetype.title_public": "Lietotāja \"{name}\" arhetips",
+  "annual_report.summary.archetype.title_self": "Tavs arhetips",
+  "annual_report.summary.close": "Aizvērt",
+  "annual_report.summary.copy_link": "Kopēt saiti",
   "annual_report.summary.most_used_app.most_used_app": "visizmantotākā lietotne",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "visizmantotākais tēmturis",
   "annual_report.summary.new_posts.new_posts": "jauni ieraksti",
@@ -158,6 +182,19 @@
   "closed_registrations_modal.find_another_server": "Atrast citu serveri",
   "closed_registrations_modal.preamble": "Mastodon ir decentralizēts, tāpēc neatkarīgi no tā, kur Tu izveido savu kontu, varēsi sekot un mijiedarboties ar ikvienu šajā serverī. Tu pat vari to pašizvietot!",
   "closed_registrations_modal.title": "Reģistrēšanās Mastodon",
+  "collections.accounts.empty_title": "Šī kolekcija ir tukša",
+  "collections.block_collection_owner": "Bloķēt kontu",
+  "collections.collection_description": "Apraksts",
+  "collections.collection_language": "Valoda",
+  "collections.collection_language_none": "Nav",
+  "collections.collection_name": "Nosaukums",
+  "collections.collection_topic": "Tēma",
+  "collections.continue": "Turpināt",
+  "collections.copy_link": "Kopēt saiti",
+  "collections.manage_accounts": "Pārvaldīt kontus",
+  "collections.remove_account": "Noņemt",
+  "collections.suggestions.can_not_add": "Nevar pievienot",
+  "collections.visibility_title": "Redzamība",
   "column.about": "Par",
   "column.blocks": "Liegtie lietotāji",
   "column.bookmarks": "Grāmatzīmes",
@@ -185,6 +222,8 @@
   "column_header.show_settings": "Rādīt iestatījumus",
   "column_header.unpin": "Atspraust",
   "column_search.cancel": "Atcelt",
+  "combobox.loading": "Ielādē",
+  "combobox.open_results": "Atvērt rezultātus",
   "community.column_settings.local_only": "Tikai vietējie",
   "community.column_settings.media_only": "Tikai multivide",
   "community.column_settings.remote_only": "Tikai attālinātie",
@@ -218,6 +257,7 @@
   "confirmations.delete.confirm": "Dzēst",
   "confirmations.delete.message": "Vai tiešām izdzēst šo ierakstu?",
   "confirmations.delete.title": "Izdzēst ierakstu?",
+  "confirmations.delete_collection.confirm": "Dzēst",
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.delete_list.title": "Izdzēst sarakstu?",
diff --git a/config/locales/doorkeeper.et.yml b/config/locales/doorkeeper.et.yml
index fb1cf2a614..786b896402 100644
--- a/config/locales/doorkeeper.et.yml
+++ b/config/locales/doorkeeper.et.yml
@@ -83,6 +83,10 @@ et:
         access_denied: Ressursi omanik või autoriseerimisserver lükkas taotluse tagasi.
         credential_flow_not_configured: Resource Owner Password Credentials vool ebaõnnestus, kuna Doorkeeper.configure.resource_owner_from_credentials ei ole seadistatud.
         invalid_client: Kliendi autentimine ebaõnnestus. Põhjus kas tundmatu klient, puudulik autentimine või toetamata autentimismeetod.
+        invalid_code_challenge_method:
+          one: "„code_challenge_method“ meetod peab olema selline: %{challenge_methods}."
+          other: "„code_challenge_method“ meetod peab olema üks neist: %{challenge_methods}."
+          zero: Kuna sobilikke „code_challenge_method“ meetodi väärtusi ei leidu, siis autentimisserver ei toeta PKCE-d.
         invalid_grant: Antud autoriseerimisluba on vale, aegunud, tagasi võetud, ei kattu kasutatud ümbersuunamise URLid või oli antud teisele kliendile.
         invalid_redirect_uri: Antud ümbersuunamise URL ei ole õige.
         invalid_request:
diff --git a/config/locales/et.yml b/config/locales/et.yml
index c2b0d918da..21e7de44ba 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -2238,7 +2238,7 @@ et:
     extra_instructions_html: <strong>Soovitus:</strong> Sinu kodulehel olev link võib olla nähtamatu. Oluline osa on <code>rel="me"</code>, mis väldib kasutaja loodud sisuga lehtedel libaisikustamist. Sa saad isegi kasutada lehe HEADER osas silti <code>link</code> sildi <code>a</code> asemel, kuid HTML peab olema kättesaadav ilma JavaScripti käivitamata.
     here_is_how: Siin on, kuidas
     hint_html: "<strong>Oma isiku tuvastamine on Mastodonis kõigi jaoks.</strong> Toetub avatud veebistandarditele, nüüd ja igavesti tasuta. Kõik, mida vajad, on isiklik veebileht, mille järgi inimesed sind tunnevad. Kui lingid oma profiililt sellele veebilehele, kontrollime me, et see veebileht lingib tagasi sinu profiilile ning näitame profiilil visuaalset tähist."
-    instructions_html: Kopeeri ja kleebi allpool olev kood oma lehe HTML lähtekoodi. Seejärel lisa oma kodulehe aadress profiili "Muuda profiili" vahekaardi ühte lisavälja ning salvesta muudatused.
+    instructions_html: Kopeeri ja aseta allpool olev kood oma lehe HTML lähtekoodi. Seejärel lisa oma kodulehe aadress profiili „Muuda profiili“ vahekaardi ühte lisavälja ning salvesta muudatused.
     verification: Kinnitamine
     verified_links: Sinu kontrollitud lingid
     website_verification: Veebilehe kontrollimine
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index aff14eaed5..71c2b7dd76 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -61,6 +61,9 @@ en-GB:
         setting_default_quote_policy_private: Followers-only posts authored on Mastodon can't be quoted by others.
         setting_default_quote_policy_unlisted: When people quote you, their post will also be hidden from trending timelines.
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
+        setting_display_media_default: Warn before showing media marked as sensitive
+        setting_display_media_hide_all: Warn before showing all media
+        setting_display_media_show_all: Show all media without warning, including media marked as sensitive
         setting_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers.
         setting_quick_boosting_html: When enabled, clicking on the %{boost_icon} Boost icon will immediately boost instead of opening the boost/quote dropdown menu. Relocates the quoting action to the %{options_icon} (Options) menu.
         setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 6e1e9343b0..906209ded4 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -134,6 +134,7 @@ et:
         otp: 'Kaheastmelise autentimise kood telefonirakendusest või mõni taastekood:'
         webauthn: Kui see on USB-võti, sisesta see ning vajadusel aktiveeri.
       settings:
+        email_subscriptions: Funktsionaalsuse keelamine säilitab olemasolevad tellijad, kuid peatab e-kirjade saatmise.
         indexable: Su profiilileht võib ilmuda Google, Bingi ja teiste otsimootorite tulemustes.
         show_application: Sa saad sõltumata sellest vaadata, milline äpp su postituse postitas.
       tag:
@@ -153,6 +154,7 @@ et:
         jurisdiction: Nimeta riik, kus elab see, kes arveid maksab. Kui tegemist on äriühingu või muu üksusega, märgi riik, kus see on asutatud, ning vajaduse korral linn, piirkond, territoorium või osariik.
         min_age: Vanus ei tohiks olla väiksem, kui sinu õigusruumis nõutav alampiir.
       user:
+        chosen_languages: Kui see valik on märgitud, kuvatakse avalikul ajajoonel ainult valitud keeltes postitusi. See seadistus ei mõjuta sinu avalehe ajajoont ega loendeid.
         date_of_birth:
           one: "%{domain} saidi teenuste kasutamiseks pead olema vähemalt %{count} aastat vana. Me ei salvesta neid andmeid."
           other: "%{domain} saidi teenuste kasutamiseks pead olema vähemalt %{count} aastat vana. Me ei salvesta neid andmeid."
@@ -175,6 +177,7 @@ et:
     labels:
       account:
         attribution_domains: Veebisaidid, mis võivad sind algallikana mainida
+        discoverable: Võimalda mind teistel avatada
         fields:
           name: Nimetus
           value: Sisu
@@ -222,6 +225,7 @@ et:
         email: E-posti aadress
         expires_in: Aegu pärast
         fields: Veebiviited
+        filter_action: Filtritoimingud
         header: Päis
         honeypot: "%{label} (ära sisesta)"
         inbox_url: Sõnumivahendusserveri sisendkausta võrguaadress
@@ -353,6 +357,7 @@ et:
         hint: Lisainfo
         text: Reegel
       settings:
+        email_subscriptions: Luba e-posti aadressiga liitumised
         indexable: Kaasa profiilileht otsimootoritesse
         show_application: Näita, millisest äpist postituse saatsid
       tag: