Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream

Gemfile.lock

@@ -411,15 +411,13 @@ GEM
       rexml
     link_header (0.0.8)
     lint_roller (1.1.0)
-    linzer (0.7.8)
+    linzer (0.7.9)
       cgi (>= 0.4.2, < 0.6.0)
       forwardable (~> 1.3, >= 1.3.3)
       logger (~> 1.7, >= 1.7.0)
       net-http (>= 0.6, < 0.10)
-      openssl (>= 3, < 5)
       rack (>= 2.2, < 4.0)
       starry (~> 0.2)
-      stringio (~> 3.1, >= 3.1.2)
       uri (~> 1.0, >= 1.0.2)
     llhttp-ffi (0.5.1)
       ffi-compiler (~> 1.0)

app/javascript/mastodon/components/dropdown_menu.tsx

@@ -90,7 +90,7 @@ export const DropdownMenuItemContent: React.FC<{ item: MenuItem }> = ({
   );
 };
 
-export const DropdownMenu = <Item = MenuItem>({
+export const DropdownMenu = <Item = MenuItem,>({
   items,
   loading,
   scrollable,

app/javascript/mastodon/locales/ar.json

@@ -224,11 +224,8 @@
   "block_modal.remote_users_caveat": "سوف نطلب من الخادم {domain} أن يحترم قرارك، لكن الالتزام غير مضمون لأن بعض الخواديم قد تتعامل مع نصوص الكتل بشكل مختلف. قد تظل المنشورات العامة مرئية للمستخدمين غير المسجلين الدخول.",
   "block_modal.show_less": "تفاصيل أقلّ",
   "block_modal.show_more": "تفاصيل أكثر",
-  "block_modal.they_cant_mention": "لن يستطيع ذِكرك أو متابعتك.",
-  "block_modal.they_cant_see_posts": "لن يستطيع مطالعة منشوراتك ولن تطالع منشوراته.",
   "block_modal.they_will_know": "سيعلم أنه قد حُظِر.",
   "block_modal.title": "أتريد حظر هذا المستخدم؟",
-  "block_modal.you_wont_see_mentions": "لن تر المنشورات التي يُشار فيهم إليه.",
   "boost_modal.combo": "يُمكنك الضّغط على {combo} لتخطي هذا في المرة المُقبلة",
   "boost_modal.reblog": "أتريد إعادة نشر المنشور؟",
   "boost_modal.undo_reblog": "أتريد إلغاء إعادة نشر المنشور؟",

app/javascript/mastodon/locales/ast.json

@@ -82,9 +82,6 @@
   "attachments_list.unprocessed": "(ensin procesar)",
   "block_modal.show_less": "Amosar menos",
   "block_modal.show_more": "Amosar más",
-  "block_modal.they_cant_mention": "Nun van poder mencionate o siguite.",
-  "block_modal.they_cant_see_posts": "Nun pueden ver les tos espublizaciones y tu nun podrás ver les suyes.",
-  "block_modal.you_wont_see_mentions": "Nun verás espublizaciones que-yos mencionen.",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",

app/javascript/mastodon/locales/az.json

@@ -165,11 +165,8 @@
   "block_modal.remote_users_caveat": "{domain} serverindən qərarınıza hörmət etməsini xahiş edəcəyik. Ancaq, bəzi serverlər əngəlləmələri fərqli şəkildə idarə edə bilər deyə, qərarınıza uymağına zəmanət verilmir. Hər kəsə açıq göndərişlər, hələ də sistemə giriş etməmiş istifadəçilərə görünə bilər.",
   "block_modal.show_less": "Daha az göstər",
   "block_modal.show_more": "Daha çox göstər",
-  "block_modal.they_cant_mention": "O səni teq edə bilməz və ya izləyə bilməz.",
-  "block_modal.they_cant_see_posts": "O sənin paylaşımlarını görməyəcək, sən də onun paylaşımlarını görməyəcəksən.",
   "block_modal.they_will_know": "O sənin onu blokladığını görə biləcək.",
   "block_modal.title": "İstifadəçi bloklansın?",
-  "block_modal.you_wont_see_mentions": "Onu teq edən postları görməyəcəksən.",
   "boost_modal.combo": "Növbəti dəfə bunu atlamaq üçün {combo} klikləyə bilərsən",
   "boost_modal.reblog": "Paylaşım təkrar paylaşılsın?",
   "boost_modal.undo_reblog": "Təkrar paylaşım ləğv edilsin?",

app/javascript/mastodon/locales/be.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Падзяліцца ў Mastodon",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
+  "block_modal.no_collections": "Вы не зможаце дадаць адно аднаго ў калекцыі. Пры патрэбе вы будзеце выдаленыя з ужо існых калекцый абаіх.",
   "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць Ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
   "block_modal.show_less": "Паказаць меньш",
   "block_modal.show_more": "Паказаць больш",
-  "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
+  "block_modal.they_cant_mention": "Вы не зможаце згадваць, падпісвацца або цытаваць адно аднаго.",
-  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць Вашых допісаў, а Вы — ягоных.",
+  "block_modal.they_cant_see_posts": "Гэты карыстальнік не зможа ўбачыць Ваш кантэнт, а Вы не зможаце ягоны.",
   "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
   "block_modal.title": "Заблакіраваць карыстальніка?",
-  "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
+  "block_modal.you_wont_see_mentions": "Вы не ўбачыце допісы іншых людзей, дзе гэты карыстальнік згадваецца.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
   "boost_modal.reblog": "Пашырыць допіс?",
   "boost_modal.undo_reblog": "Прыбраць допіс?",

app/javascript/mastodon/locales/bg.json

@@ -113,11 +113,8 @@
   "block_modal.remote_users_caveat": "Ще приканим сървъра {domain} да уважава решението ви. За съжаление не можем да гарантираме това защото някои сървъри могат да третират блокиранията по различен начин. Публичните постове може да продължат да бъдат видими за потребители, които не са се регистрирали.",
   "block_modal.show_less": "Повече на показ",
   "block_modal.show_more": "По-малко на показ",
-  "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
-  "block_modal.they_cant_see_posts": "Те не могат да виждат публикациите ви, а и вие не можете да виждате техните.",
   "block_modal.they_will_know": "Те могат да видят, че са блокирани.",
   "block_modal.title": "Блокирате ли потребителя?",
-  "block_modal.you_wont_see_mentions": "Няма да виждате публикациите, които ги споменават.",
   "boost_modal.combo": "Можете да натиснете {combo}, за да пропуснете това следващия път",
   "boost_modal.reblog": "Подсилвате ли публикация?",
   "boost_modal.undo_reblog": "Без подсилване на публикация ли?",

app/javascript/mastodon/locales/br.json

@@ -107,7 +107,6 @@
   "audio.hide": "Kuzhat ar c'hleved",
   "block_modal.show_less": "Diskouez nebeutoc'h",
   "block_modal.show_more": "Diskouez muioc'h",
-  "block_modal.they_cant_mention": "Ne c'hall na menegiñ na heuliañ ac'hanoc'h.",
   "block_modal.title": "Stankañ an implijer·ez?",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
   "boost_modal.reblog": "Skignañ an embannadur?",

app/javascript/mastodon/locales/ca.json

@@ -169,11 +169,8 @@
   "block_modal.remote_users_caveat": "Li demanarem al servidor {domain} que respecti la vostra decisió, tot i que no podem garantir-ho, ja que alguns servidors gestionen de forma diferent els blocatges. És possible que els usuaris no autenticats puguin veure les publicacions públiques.",
   "block_modal.show_less": "Mostra'n menys",
   "block_modal.show_more": "Mostra'n més",
-  "block_modal.they_cant_mention": "No us poden esmentar, ni seguir.",
-  "block_modal.they_cant_see_posts": "No poden veure les vostres publicacions, ni vosaltres les seves.",
   "block_modal.they_will_know": "Poden veure que els heu blocat.",
   "block_modal.title": "Bloquem l'usuari?",
-  "block_modal.you_wont_see_mentions": "No veureu publicacions que l'esmentin.",
   "boost_modal.combo": "Pots prémer {combo} per a evitar-ho el pròxim cop",
   "boost_modal.reblog": "Voleu impulsar la publicació?",
   "boost_modal.undo_reblog": "Voleu retirar l'impuls a la publicació?",

app/javascript/mastodon/locales/cs.json

@@ -210,11 +210,8 @@
   "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
   "block_modal.show_less": "Zobrazit méně",
   "block_modal.show_more": "Zobrazit více",
-  "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
-  "block_modal.they_cant_see_posts": "Nemůže vidět vaše příspěvky a vy neuvidíte jeho.",
   "block_modal.they_will_know": "Může vidět, že je zablokovaný.",
   "block_modal.title": "Zablokovat uživatele?",
-  "block_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které ho zmiňují.",
   "boost_modal.combo": "Příště můžete pro přeskočení stisknout {combo}",
   "boost_modal.reblog": "Boostnout příspěvek?",
   "boost_modal.undo_reblog": "Zrušit boostování příspěvku?",

app/javascript/mastodon/locales/cy.json

@@ -43,6 +43,7 @@
   "account.featured": "Nodwedd",
   "account.featured.accounts": "Proffilau",
   "account.featured.collections": "Casgliadau",
+  "account.featured.new_collection": "Casgliad newydd",
   "account.field_overflow": "Dangos cynnwys llawn",
   "account.filters.all": "Pob gweithgaredd",
   "account.filters.boosts_toggle": "Dangos hybiau",
@@ -68,8 +69,19 @@
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
   "account.in_memoriam": "Er Cof.",
+  "account.join_modal.day": "Diwrnod",
+  "account.join_modal.me": "Rydych wedi ymuno â {server} ar",
+  "account.join_modal.me_anniversary": "Ffedysawd Hapus! Rydych wedi ymuno â {server} ar",
+  "account.join_modal.me_today": "Dyma'ch diwrnod cyntaf ar {server}!",
+  "account.join_modal.other": "Ymunodd {name} â {server} ar",
+  "account.join_modal.other_today": "Mae'n diwrnod cyntaf {name} ar {server}!",
+  "account.join_modal.share.celebrate": "Rhannwch bostiad dathlu",
+  "account.join_modal.share.intro": "Rhannu postiad cyflwyno",
+  "account.join_modal.share.welcome": "Rhannwch postiad croeso",
+  "account.join_modal.years": "{number, plural, one {blwyddyn} other {blwyddyn}}",
   "account.joined_short": "Ymunodd",
   "account.languages": "Newid ieithoedd wedi tanysgrifio iddyn nhw",
+  "account.last_active": "Yn weithgar ddiwethaf",
   "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
   "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i fod ar glo. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
   "account.media": "Cyfryngau",
@@ -98,8 +110,10 @@
   "account.mute_short": "Anwybyddu",
   "account.muted": "Wedi anwybyddu",
   "account.mutual": "Rydych chi'n dilyn eich gilydd",
+  "account.name.copy": "Copïo dolen",
   "account.name.help.domain": "{domain} yw'r gweinydd sy'n cynnal proffil a phostiadau'r defnyddiwr.",
   "account.name.help.domain_self": "{domain} yw eich gweinydd sy'n cynnal eich proffil a'ch postiadau.",
+  "account.name.help.footer": "Yn union fel y gallwch anfon negeseuon e-bost at bobl gan ddefnyddio gwahanol ddarparwyr e-bost, gallwch ryngweithio â phobl ar weinyddion Mastodon eraill, a chyda neb ar apiau Ffedysawd eraill.",
   "account.name.help.header": "Mae dolen fel cyfeiriad e-bost",
   "account.name.help.username": "{username} yw enw defnyddiwr y cyfrif hwn ar eu gweinydd. Efallai bod gan rywun ar weinydd arall yr un enw defnyddiwr.",
   "account.name.help.username_self": "{username} yw eich enw defnyddiwr ar y gweinydd hwn. Efallai bod gan rywun ar weinydd arall yr un enw defnyddiwr.",
@@ -114,6 +128,7 @@
   "account.note.edit_button": "Golygu",
   "account.note.title": "Nodyn personol (yn weladwy i chi yn unig)",
   "account.open_original_page": "Agor y dudalen wreiddiol",
+  "account.pending": "Dan ystyriaeth",
   "account.posts": "Postiadau",
   "account.remove_from_followers": "Tynnu {name} o'ch dilynwyr",
   "account.report": "Adrodd @{name}",
@@ -132,29 +147,45 @@
   "account.unmute": "Dad-dewi {name}",
   "account.unmute_notifications_short": "Dad-dewi hysbysiadau",
   "account.unmute_short": "Dad-anwybyddu",
+  "account_edit.advanced_settings.bot_hint": "Rhoi arwydd i eraill bod y cyfrif yn bennaf yn cyflawni gweithredoedd awtomataidd ac efallai fydd e ddim yn cael ei fonitro",
+  "account_edit.advanced_settings.bot_label": "Cyfrif awtomataidd",
+  "account_edit.advanced_settings.title": "Gosodiadau uwch",
+  "account_edit.bio.add_label": "Ychwanegu cyflwyniad",
+  "account_edit.bio.edit_label": "Golygu'r cyflwyniad",
   "account_edit.bio.placeholder": "Ychwanegwch gyflwyniad byr i helpu eraill i'ch adnabod chi.",
   "account_edit.bio.title": "Cyflwyniad",
   "account_edit.bio_modal.add_title": "Ychwanegu cyflwyniad",
   "account_edit.bio_modal.edit_title": "Golygu'r cyflwyniad",
   "account_edit.column_button": "Gorffen",
   "account_edit.column_title": "Golygu Proffil",
+  "account_edit.custom_fields.add_label": "Ychwanegu maes",
+  "account_edit.custom_fields.edit_label": "Golygu maes",
   "account_edit.custom_fields.placeholder": "Ychwanegwch eich rhagenwau, dolenni allanol, neu unrhyw beth arall hoffech ei rannu.",
   "account_edit.custom_fields.reorder_button": "Ail-drefnu meysydd",
   "account_edit.custom_fields.tip_content": "Gallwch chi ychwanegu hygrededd at eich cyfrif Mastodon yn hawdd trwy wirio dolenni i unrhyw wefannau rydych chi'n berchen arnyn nhw.",
   "account_edit.custom_fields.tip_title": "Awgrym: Ychwanegu dolenni wedi'u gwirio",
   "account_edit.custom_fields.title": "Meysydd cyfaddas",
   "account_edit.custom_fields.verified_hint": "Sut ydw i'n ychwanegu dolen wedi'i gwirio?",
+  "account_edit.display_name.add_label": "Ychwanegu enw dangos",
+  "account_edit.display_name.edit_label": "Golygu enw dangos",
   "account_edit.display_name.placeholder": "Eich enw dangos yw sut mae'ch enw'n ymddangos ar eich proffil ac mewn llinellau amser.",
   "account_edit.display_name.title": "Enw dangos",
+  "account_edit.featured_hashtags.edit_label": "Ychwanegu hashnodau",
   "account_edit.featured_hashtags.placeholder": "Helpwch eraill i adnabod, a chael mynediad cyflym at eich hoff bynciau.",
   "account_edit.featured_hashtags.title": "Hashnodau dan sylw",
+  "account_edit.field_actions.delete": "Dileu maes",
+  "account_edit.field_actions.edit": "Golygu maes",
   "account_edit.field_delete_modal.confirm": "Ydych chi'n siŵr eich bod chi eisiau dileu'r maes cyfaddas hwn? Does dim modd dadwneud y weithred hon.",
   "account_edit.field_delete_modal.delete_button": "Dileu",
   "account_edit.field_delete_modal.title": "Dileu maes cyfaddas?",
   "account_edit.field_edit_modal.add_title": "Ychwanegu maes cyfaddas",
+  "account_edit.field_edit_modal.discard_confirm": "Dileu",
+  "account_edit.field_edit_modal.discard_message": "Mae gennych chi newidiadau heb eu cadw. Ydych chi'n siŵr eich bod chi eisiau eu dileu?",
   "account_edit.field_edit_modal.edit_title": "Golygu maes cyfaddas",
+  "account_edit.field_edit_modal.length_warning": "Wedi mynd y tu hwnt i'r terfyn nodau sy'n cael eu hargymell. Efallai bydd defnyddwyr symudol ddim yn gweld eich maes yn llawn.",
   "account_edit.field_edit_modal.link_emoji_warning": "Rydym yn argymell yn erbyn defnyddio emoji personol ar y cyd ag URLau. Bydd meysydd personol sy'n cynnwys y ddau yn cael eu harddangos fel testun yn unig yn hytrach nag fel dolen, er mwyn atal dryswch ymhlith defnyddwyr.",
   "account_edit.field_edit_modal.name_hint": "e.e. “Gwefan bersonol”",
+  "account_edit.field_edit_modal.name_label": "Label",
   "account_edit.field_edit_modal.url_warning": "I ychwanegu dolen, cofiwch gynnwys {protocol} ar y dechrau.",
   "account_edit.field_edit_modal.value_hint": "E.e. “https://example.me”",
   "account_edit.field_edit_modal.value_label": "Gwerth",
@@ -180,6 +211,8 @@
   "account_edit.image_edit.alt_edit_button": "Golygu testun amgen",
   "account_edit.image_edit.remove_button": "Tynnu delwedd",
   "account_edit.image_edit.replace_button": "Amnewid delwedd",
+  "account_edit.item_list.delete": "Dileu {name}",
+  "account_edit.item_list.edit": "Golygu {name}",
   "account_edit.name_modal.add_title": "Ychwanegu enw dangos",
   "account_edit.name_modal.edit_title": "Golygu enw dangos",
   "account_edit.profile_tab.button_label": "Cyfaddasu",
@@ -191,6 +224,10 @@
   "account_edit.profile_tab.show_media.title": "Dangos y tab ‘Cyfryngau’",
   "account_edit.profile_tab.show_media_replies.description": "Pan fydd wedi'i alluogi, mae'r tab Cyfryngau yn dangos eich postiadau ac atebion i bostiadau pobl eraill.",
   "account_edit.profile_tab.show_media_replies.title": "Cynhwyswch atebion ar y tab ‘Cyfryngau’",
+  "account_edit.profile_tab.show_relations.description": "Yn dangos cyfrifon rydych chi'n eu dilyn a dilynwyr i ddefnyddwyr eraill yn eich proffil. Bydd pobl yn dal i allu gweld a ydych chi'n eu dilyn.",
+  "account_edit.profile_tab.show_relations.title": "Dangos ‘Dilynwyr’ ac ‘Yn Dilyn’",
+  "account_edit.profile_tab.subtitle": "Cyfaddaswch sut mae eich proffil yn cael ei ddangos.",
+  "account_edit.profile_tab.title": "Gosodiadau dangos proffil",
   "account_edit.save": "Cadw",
   "account_edit.upload_modal.back": "Nôl",
   "account_edit.upload_modal.done": "Gorffen",
@@ -200,6 +237,10 @@
   "account_edit.upload_modal.step_upload.dragging": "Gollwng i lwytho i fyny",
   "account_edit.upload_modal.step_upload.header": "Dewiswch ddelwedd",
   "account_edit.upload_modal.step_upload.hint": "Fformat WEBP, PNG, GIF neu JPG, hyd at {limit}MB.{br}Bydd y ddelwedd yn cael ei haddasu i {width}x{height}px.",
+  "account_edit.upload_modal.title_add.avatar": "Ychwanegu llun proffil",
+  "account_edit.upload_modal.title_add.header": "Ychwanegu llun clawr",
+  "account_edit.upload_modal.title_replace.avatar": "Amnewid llun proffil",
+  "account_edit.upload_modal.title_replace.header": "Amnewid llun clawr",
   "account_edit.verified_modal.details": "Ychwanegwch hygrededd at eich proffil Mastodon trwy wirio dolenni i wefannau personol. Dyma sut mae'n gweithio:",
   "account_edit.verified_modal.invisible_link.details": "Ychwanegwch y ddolen at eich pennyn. Y rhan bwysig yw rel=\"me\" sy'n atal dynwared ar wefannau gyda chynnwys sy'n cael ei gynhyrchu gan ddefnyddwyr. Gallwch hyd yn oed ddefnyddio tag dolen ym mhennyn y dudalen yn lle {tag}, ond rhaid bod yr HTML yn hygyrch ac heb weithredu JavaScript.",
   "account_edit.verified_modal.invisible_link.summary": "Sut ydw i'n gwneud y ddolen yn anweledig?",
@@ -208,10 +249,14 @@
   "account_edit.verified_modal.step2.header": "Ychwanegwch eich gwefan fel maes cyfaddas",
   "account_edit.verified_modal.title": "Sut i ychwanegu dolen wedi'i gwirio",
   "account_edit_tags.add_tag": "Ychwanegu #{tagName}",
+  "account_edit_tags.column_title": "Golygu Tagiau",
   "account_edit_tags.help_text": "Mae hashnodau dan sylw yn helpu defnyddwyr i ddarganfod a rhyngweithio â'ch proffil. Maen nhw'n ymddangos fel hidlwyr ar olwg Gweithgaredd eich tudalen Proffil.",
+  "account_edit_tags.max_tags_reached": "Rydych chi wedi cyrraedd y nifer uchaf o hashnodau dan sylw.",
   "account_edit_tags.search_placeholder": "Rhowch hashnod…",
   "account_edit_tags.suggestions": "Awgrymiadau:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# postiad} other {# postsiad}}",
+  "account_list.hidden_notice": "Dim ond chi sy'n gallu gweld hyn. I ddangos y rhestr hon i eraill, ewch i<link> {page} > {modal} > {field}</link> .",
+  "account_list.total": "{total, plural, one {# cyfrif} other {# cyfrif}}",
   "account_note.placeholder": "Clicio i ychwanegu nodyn",
   "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
   "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru",
@@ -286,11 +331,8 @@
   "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystrau mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
   "block_modal.show_less": "Dangos llai",
   "block_modal.show_more": "Dangos rhagor",
-  "block_modal.they_cant_mention": "Dydyn nhw ddim yn gallu eich crybwyll na'ch dilyn.",
-  "block_modal.they_cant_see_posts": "Dydyn nhw ddim yn gallu gweld eich postiadau a fyddwch chi ddim yn gweld eu rhai nhw.",
   "block_modal.they_will_know": "Gallan nhw weld eu bod wedi'u rhwystro.",
   "block_modal.title": "Blocio defnyddiwr?",
-  "block_modal.you_wont_see_mentions": "Fyddwch chi ddim yn gweld postiadau sy'n sôn amdanyn nhw.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "boost_modal.reblog": "Hybu postiad?",
   "boost_modal.undo_reblog": "Dad-hybu postiad?",
@@ -316,6 +358,7 @@
   "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall",
   "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!",
   "closed_registrations_modal.title": "Cofrestru ar Mastodon",
+  "collection.share_modal.share_link_label": "Rhannu dolen",
   "collection.share_modal.share_via_post": "Postio ar Mastodon",
   "collection.share_modal.share_via_system": "Rhannwch i…",
   "collection.share_modal.title": "Rhannu casgliad",
@@ -323,38 +366,70 @@
   "collection.share_template_other": "Edrychwch ar y casgliad trawiadol hwn: {link}",
   "collection.share_template_own": "Edrychwch ar fy nghasgliad newydd: {link}",
   "collections.account_count": "{count, plural, one {# cyfrif} other {# cyfrif}}",
+  "collections.accounts.empty_description": "Ychwanegu hyd at {count} cyfrif",
+  "collections.accounts.empty_editor_title": "Does neb yn y casgliad hwn eto",
   "collections.accounts.empty_title": "Mae'r casgliad hwn yn wag",
+  "collections.block_collection_owner": "Rhwystro cyfrif",
+  "collections.by_account": "gan {account_handle}",
   "collections.collection_description": "Disgrifiad",
+  "collections.collection_language": "Iaith",
+  "collections.collection_language_none": "Dim",
   "collections.collection_name": "Enw",
   "collections.collection_topic": "Pwnc",
   "collections.confirm_account_removal": "Ydych chi'n siŵr eich bod chi eisiau tynnu'r cyfrif hwn o'r casgliad hwn?",
   "collections.content_warning": "Rhybudd cynnwys",
   "collections.continue": "Parhau",
+  "collections.copy_link": "Copïo dolen",
+  "collections.copy_link_confirmation": "Copïwyd dolen y casgliad i'r clipfwrdd",
   "collections.create.accounts_title": "Pwy fyddwch chi'n ei gynnwys yn y casgliad hwn?",
   "collections.create.basic_details_title": "Manylion sylfaenol",
   "collections.create.steps": "Cam {step}/{total}",
   "collections.create_collection": "Creu casgliad",
   "collections.delete_collection": "Dileu casgliad",
   "collections.description_length_hint": "Terfyn o 100 nod",
+  "collections.detail.author_added_you_on_date": "Ychwanegodd {author} chi ar {date}",
   "collections.detail.loading": "Yn llwytho casgliad…",
   "collections.detail.revoke_inclusion": "Tynnu fi",
+  "collections.detail.sensitive_content": "Cynnwys sensitif",
   "collections.detail.sensitive_note": "Mae'r casgliad hwn yn cynnwys cyfrifon a chynnwys a allai fod yn sensitif i rai defnyddwyr.",
   "collections.detail.share": "Rhannu'r casgliad hwn",
+  "collections.detail.you_are_in_this_collection": "Rydych chi wedi'ch cynnwys yn y casgliad hwn",
   "collections.edit_details": "Golygu manylion",
+  "collections.error_loading_collections": "Bu gwall wrth geisio llwytho'r casgliadau hyn.",
+  "collections.hidden_accounts_description": "Rydych chi wedi'ch rhwystro neu mudo {count, plural, one {defnyddiwr} other {defnyddiwr}}",
+  "collections.hidden_accounts_link": "{count, plural, one {# cyfrif cudd} other {# cyfrif cudd}}",
+  "collections.hints.accounts_counter": "{count} / {max} cyfrif",
   "collections.last_updated_at": "Diweddarwyd ddiwethaf: {date}",
+  "collections.list.collections_with_count": "{count, plural, one {# Casgliad} other {# Casgliad}}",
+  "collections.list.created_by_author": "Crëwyd gan {name}",
+  "collections.list.created_by_you": "Crëwyd gan gennych chi",
+  "collections.list.featuring_you": "Yn eich cynnwys chi",
   "collections.manage_accounts": "Rheoli cyfrifon",
   "collections.mark_as_sensitive": "Marcio fel sensitif",
   "collections.mark_as_sensitive_hint": "Yn cuddio disgrifiad a chyfrifon y casgliad y tu ôl i rybudd cynnwys. Bydd enw'r casgliad yn dal i fod yn weladwy.",
+  "collections.maximum_collection_count_description": "Mae eich gweinydd yn caniatáu creu hyd at {count} o gasgliadau.",
+  "collections.maximum_collection_count_reached": "Rydych chi wedi creu'r nifer mwyaf o gasgliadau",
   "collections.name_length_hint": "Terfyn o 40 nod",
   "collections.new_collection": "Casgliad newydd",
+  "collections.pending_accounts.message": "Gall cyfrifon ymddangos fel rhai sydd ar y gweill pan fyddwn yn aros am ymateb gan y defnyddiwr neu ei weinydd. Dim ond chi all weld cyfrifon sydd ar y gweill.",
+  "collections.pending_accounts.title": "Pam rydw i'n gweld cyfrifon sydd ar y gweill?",
+  "collections.remove_account": "Tynnu",
   "collections.report_collection": "Adroddwch am y casgliad hwn",
   "collections.revoke_collection_inclusion": "Tynnu fy hun o'r casgliad hwn",
   "collections.revoke_inclusion.confirmation": "Rydych chi wedi cael eich tynnu o \"{collection}\"",
   "collections.revoke_inclusion.error": "Bu gwall, ceisiwch eto yn nes ymlaen.",
+  "collections.search_accounts_label": "Chwiliwch am gyfrif i'w ychwanegu",
   "collections.search_accounts_max_reached": "Rydych chi wedi ychwanegu'r nifer mwyaf o gyfrifon",
   "collections.sensitive": "Sensitif",
+  "collections.share_short": "Rhannu",
+  "collections.suggestions.can_not_add": "Dim modd ei ychwanegu",
+  "collections.suggestions.can_not_add_desc": "Efallai bod y cyfrifon hyn wedi dewis peidio â chael eu darganfod, neu efallai eu bod ar weinydd nad yw'n cefnogi casgliadau.",
+  "collections.suggestions.must_follow": "Rhaid dilyn yn gyntaf",
+  "collections.suggestions.must_follow_desc": "Mae'r cyfrifon hyn yn adolygu pob cais dilyn. Gall dilynwyr eu hychwanegu at gasgliadau.",
   "collections.topic_hint": "Ychwanegwch hashnod sy'n helpu eraill i ddeall prif bwnc y casgliad hwn.",
   "collections.topic_special_chars_hint": "Bydd nodau arbennig yn cael eu tynnu wrth gadw",
+  "collections.unlisted_collections_description": "Nid yw'r rhain yn ymddangos ar eich proffil i eraill. Gall unrhyw un sydd â'r ddolen eu darganfod.",
+  "collections.unlisted_collections_with_count": "Casgliadau heb eu rhestru ({count})",
   "collections.view_collection": "Gweld y casgliad",
   "collections.visibility_public": "Cyhoeddus",
   "collections.visibility_public_hint": "Mae modd eu canfod mewn canlyniadau chwilio a mannau eraill lle mae argymhellion yn ymddangos.",
@@ -380,8 +455,10 @@
   "column.lists": "Rhestrau",
   "column.mutes": "Defnyddwyr wedi'u tewi",
   "column.notifications": "Hysbysiadau",
+  "column.other_collections": "Casgliadau gan {name}",
   "column.pins": "Postiadau wedi eu pinio",
   "column.public": "Ffrwd y ffederasiwn",
+  "column.your_collections": "Eich Casgliadau",
   "column_back_button.label": "Nôl",
   "column_header.hide_settings": "Cuddio'r dewisiadau",
   "column_header.moveLeft_settings": "Symud y golofn i'r chwith",
@@ -446,6 +523,10 @@
   "confirmations.follow_to_list.confirm": "Dilyn ac ychwanegu at y rhestr",
   "confirmations.follow_to_list.message": "Mae angen i chi fod yn dilyn {name} i'w ychwanegu at restr.",
   "confirmations.follow_to_list.title": "Dilyn defnyddiwr?",
+  "confirmations.hide_featured_tab.confirm": "Cuddio'r tab",
+  "confirmations.hide_featured_tab.intro": "Gallwch newid hyn unrhyw bryd o dan <i>Golygu proffil > gosodiadau'r tab Proffil</i> .",
+  "confirmations.hide_featured_tab.message": "Bydd hyn yn cuddio'r tab ar gyfer defnyddwyr ar {serverName} a gweinyddion eraill sy'n rhedeg y fersiwn ddiweddaraf o Mastodon. Gall dangosiadau eraill amrywio.",
+  "confirmations.hide_featured_tab.title": "Cuddio'r tab \"Nodwedd\"?",
   "confirmations.logout.confirm": "Allgofnodi",
   "confirmations.logout.message": "Ydych chi'n siŵr eich bod am allgofnodi?",
   "confirmations.logout.title": "Allgofnodi?",
@@ -484,6 +565,7 @@
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
   "content_warning.show_more": "Dangos rhagor",
+  "content_warning.show_short": "Dangos",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -524,6 +606,14 @@
   "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
   "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
   "dropdown.empty": "Dewis dewis",
+  "email_subscriptions.email": "E-bost",
+  "email_subscriptions.form.action": "Tanysgrifio",
+  "email_subscriptions.form.bottom": "Derbyniwch bostiadau yn eich blwch derbyn heb greu cyfrif Mastodon. Dad-danysgrifiwch unrhyw bryd. Am ragor o wybodaeth, cyfeiriwch at y <a>Polisi Preifatrwydd</a> .",
+  "email_subscriptions.form.title": "Cofrestrwch am ddiweddariadau e-bost gan {name}",
+  "email_subscriptions.submitted.lead": "Gwiriwch eich blwch derbyn am e-bost i orffen cofrestru ar gyfer diweddariadau e-bost.",
+  "email_subscriptions.submitted.title": "Un cam arall",
+  "email_subscriptions.validation.email.blocked": "Darparwr e-bost wedi'i rwystro",
+  "email_subscriptions.validation.email.invalid": "Cyfeiriad e-bost annilys",
   "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
   "embed.preview": "Dyma sut olwg fydd arno:",
   "emoji_button.activity": "Gweithgarwch",
@@ -541,12 +631,21 @@
   "emoji_button.search_results": "Canlyniadau chwilio",
   "emoji_button.symbols": "Symbolau",
   "emoji_button.travel": "Teithio a Llefydd",
+  "empty_column.account_featured.other": "Nid yw {acct} wedi cynnwys unrhyw beth eto.",
+  "empty_column.account_featured_self.no_collections_button": "Creu casgliad",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Cuddio'r tab hwn yn lle hynny",
+  "empty_column.account_featured_self.pre_collections": "Cadwch lygad allan am Gasgliadau",
+  "empty_column.account_featured_self.pre_collections_desc": "Mae Casgliadau (sy'n dod yn Mastodon 4.6) yn caniatáu ichi greu eich rhestrau cyfrifon wedi'u curadu eich hun i'w hargymell i eraill.",
+  "empty_column.account_featured_self.showcase_accounts": "Dangoswch eich hoff gyfrifon",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Rhestrau wedi'u curadu o gyfrifon yw Casgliadau i helpu eraill i ddarganfod mwy o'r Fediverse.",
+  "empty_column.account_featured_unknown.other": "Dyw'r cyfrif hwn ddim wedi cynnwys unrhyw beth eto.",
   "empty_column.account_hides_collections": "Mae'r defnyddiwr wedi dewis i beidio rhannu'r wybodaeth yma",
   "empty_column.account_suspended": "Cyfrif wedi'i atal",
   "empty_column.account_timeline": "Dim postiadau yma!",
   "empty_column.account_unavailable": "Dyw'r proffil ddim ar gael",
   "empty_column.blocks": "Dydych chi heb rwystro unrhyw ddefnyddwyr eto.",
   "empty_column.bookmarked_statuses": "Does gennych chi ddim unrhyw bostiad wedi'u cadw fel nod tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
+  "empty_column.collections.featured_in": "Dydych chi heb gael eich ychwanegu at unrhyw gasgliadau eto.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
   "empty_column.direct": "Does gennych chi unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
   "empty_column.disabled_feed": "Mae'r ffrwd hon wedi'i hanalluogi gan weinyddwyr eich gweinydd.",
@@ -580,6 +679,10 @@
   "featured_carousel.header": "{count, plural, one {Postiad wedi'i binio} other {Postiadau wedi'u pinio}}",
   "featured_carousel.slide": "Postiad {current, number} of {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Yn ddiweddar rydych chi wedi postio am {items}. Ychwanegu'r rhain fel hashnodau dan sylw?",
+  "featured_tags.suggestions.add": "Ychwanegu",
+  "featured_tags.suggestions.added": "Rheoli eich hashnodau dan sylw ar unrhyw adeg o dan<link> Golygu Proffil > Hashnodau dan sylw</link> .",
+  "featured_tags.suggestions.dismiss": "Dim diolch",
   "filter_modal.added.context_mismatch_explanation": "Dyw'r categori hidlo hwn ddim yn berthnasol i'r cyd-destun yr ydych wedi cyrchu'r postiad hwn ynddo. Os ydych chi am i'r postiad gael ei hidlo yn y cyd-destun hwn hefyd, bydd yn rhaid i chi olygu'r hidlydd.",
   "filter_modal.added.context_mismatch_title": "Diffyg cyfatebiaeth cyd-destun!",
   "filter_modal.added.expired_explanation": "Mae'r categori hidlydd hwn wedi dod i ben, bydd angen i chi newid y dyddiad dod i ben er mwyn iddo fod yn berthnasol.",
@@ -622,7 +725,9 @@
   "follow_suggestions.who_to_follow": "Pwy i ddilyn",
   "followed_tags": "Hashnodau rydych yn eu dilyn",
   "followers.hide_other_followers": "Mae'r defnyddiwr hwn wedi dewis peidio â gwneud ei ddilynwyr eraill yn weladwy",
+  "followers.title": "Yn dilyn {name}",
   "following.hide_other_following": "Mae'r defnyddiwr hwn wedi dewis peidio â gwneud gweddill y rhai maen nhw'n eu dilyn yn weladwy",
+  "following.title": "Wedi'i ddilyn gan {name}",
   "footer.about": "Ynghylch",
   "footer.about_mastodon": "Ynglŷn â Mastodon",
   "footer.about_server": "Ynglŷn â {domain}",
@@ -634,6 +739,7 @@
   "footer.source_code": "Gweld y cod ffynhonnell",
   "footer.status": "Statws",
   "footer.terms_of_service": "Telerau gwasanaeth",
+  "form_error.blank": "Gall y maes ddim fod yn wag.",
   "form_field.optional": "(dewisol)",
   "generic.saved": "Wedi'i Gadw",
   "getting_started.heading": "Dechrau arni",
@@ -817,6 +923,7 @@
   "navigation_panel.expand_followed_tags": "Agor dewislen hashnodau dilyn",
   "navigation_panel.expand_lists": "Ehangu dewislen y rhestr",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
+  "notification.added_to_collection": "Ychwanegodd {name} chi at gasgliad",
   "notification.admin.report": "Adroddodd {name} {target}",
   "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}",
   "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}",
@@ -826,6 +933,7 @@
   "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}",
   "notification.annual_report.message": "Mae eich #Wrapstodon {year} yn aros i chi! Gwelwch eich uchafbwyntiau ac amseroedd i'w cofio o'r flwyddyn hon ar Mastodon!",
   "notification.annual_report.view": "Gweld #Wrapstodon",
+  "notification.collection_update": "Golygodd {name} gasgliad rydych chi ynddo",
   "notification.favourite": "Ffafriodd {name} eich postiad",
   "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# arall}}</a> eich postiad",
   "notification.favourite_pm": "Mae {name} wedi ffefrynnu eich cyfeiriad preifat",
@@ -1089,6 +1197,7 @@
   "server_banner.active_users": "defnyddwyr gweithredol",
   "server_banner.administered_by": "Gweinyddir gan:",
   "server_banner.is_one_of_many": "Mae {domain} yn un o'r nifer o weinyddion Mastodon annibynnol y gallwch eu defnyddio i gymryd rhan yn y ffedysawd.",
+  "server_banner.more_about_this_server": "Mwy am y gweinydd hwn",
   "server_banner.server_stats": "Ystadegau'r gweinydd:",
   "sign_in_banner.create_account": "Creu cyfrif",
   "sign_in_banner.follow_anyone": "Dilynwch unrhyw un ar draws y ffedysawd a gweld y cyfan mewn trefn gronolegol. Dim algorithmau, hysbysebion, na straeon er mwyn cliciadau yn y golwg.",

app/javascript/mastodon/locales/da.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Del på Mastodon",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
+  "block_modal.no_collections": "I kan ikke tilføje hinanden til samlinger. I bliver automatisk fjernet fra hinandens eksisterende samlinger, hvis det er relevant.",
   "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis flere",
-  "block_modal.they_cant_mention": "Vedkommende kan ikke omtale eller følge dig.",
+  "block_modal.they_cant_mention": "I kan ikke omtale, følge eller citere hinanden.",
-  "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
+  "block_modal.they_cant_see_posts": "De kan ikke se dit indhold, og du kan ikke se deres.",
   "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
   "block_modal.title": "Blokér bruger?",
-  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som omtaler vedkommende.",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg fra andre, hvor de omtales.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "boost_modal.reblog": "Fremhæv indlæg?",
   "boost_modal.undo_reblog": "Fjern fremhævelse af indlæg?",

app/javascript/mastodon/locales/de.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Wir werden den Server {domain} bitten, deine Entscheidung zu respektieren. Allerdings kann nicht garantiert werden, dass sie eingehalten wird, weil einige Server Blockierungen unterschiedlich handhaben können. Öffentliche Beiträge können für nicht angemeldete Nutzer*innen weiterhin sichtbar sein.",
   "block_modal.show_less": "Weniger anzeigen",
   "block_modal.show_more": "Mehr anzeigen",
-  "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
-  "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
   "block_modal.they_will_know": "Das Profil wird erkennen können, dass du es blockiert hast.",
   "block_modal.title": "Profil blockieren?",
-  "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} erscheint dieses Fenster nicht mehr",
   "boost_modal.reblog": "Beitrag teilen?",
   "boost_modal.undo_reblog": "Beitrag nicht mehr teilen?",

app/javascript/mastodon/locales/el.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Κοινοποίηση στο Mastodon",
   "attachments_list.unprocessed": "(μη επεξεργασμένο)",
   "audio.hide": "Απόκρυψη αρχείου ήχου",
+  "block_modal.no_collections": "Κανένας από τους δύο σας δεν μπορεί να προσθέσει ο ένας τον άλλο σε συλλογές. Θα αφαιρεθεί αυτόματα ο ένας από τις υπάρχουσες συλλογές του άλλου, αν υπάρχουν.",
   "block_modal.remote_users_caveat": "Θα ζητήσουμε από τον διακομιστή {domain} να σεβαστεί την απόφασή σου. Ωστόσο, η συμμόρφωση δεν είναι εγγυημένη δεδομένου ότι ορισμένοι διακομιστές ενδέχεται να χειρίζονται τους αποκλεισμούς διαφορετικά. Οι δημόσιες αναρτήσεις ενδέχεται να είναι ορατές σε μη συνδεδεμένους χρήστες.",
   "block_modal.show_less": "Εμφάνιση λιγότερων",
   "block_modal.show_more": "Εμφάνιση περισσότερων",
-  "block_modal.they_cant_mention": "Δεν μπορεί να σε επισημάνει ή να σε ακολουθήσει.",
+  "block_modal.they_cant_mention": "Δεν μπορείτε να επισημάνετε, να ακολουθήσετε ή να παραθέσετε ο ένας τον άλλον.",
-  "block_modal.they_cant_see_posts": "Δεν μπορεί να δει τις αναρτήσεις σου και δε θα δεις τις δικές του.",
+  "block_modal.they_cant_see_posts": "Δεν μπορεί να δει το περιεχόμενό σου και δε θα δεις το δικό του.",
   "block_modal.they_will_know": "Μπορούν να δει ότι έχει αποκλειστεί.",
   "block_modal.title": "Αποκλεισμός χρήστη;",
-  "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον επισημαίνουν.",
+  "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις από άλλους που τον επισημαίνουν.",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
   "boost_modal.reblog": "Ενίσχυση ανάρτησης;",
   "boost_modal.undo_reblog": "Αναίρεση ενίσχυσης;",
@@ -713,8 +714,8 @@
   "follow_requests.unlocked_explanation": "Παρόλο που ο λογαριασμός σου δεν είναι κλειδωμένος, το προσωπικό του {domain} θεώρησε πως ίσως να θέλεις να ελέγχεις χειροκίνητα αυτά τα αιτήματα ακολούθησης.",
   "follow_suggestions.curated_suggestion": "Επιλογή προσωπικού",
   "follow_suggestions.dismiss": "Να μην εμφανιστεί ξανά",
-  "follow_suggestions.featured_longer": "Προσεκτικά επιλεγμένα απ' την ομάδα του {domain}",
+  "follow_suggestions.featured_longer": "Προσεκτικά επιλεγμένο απ' την ομάδα του {domain}",
-  "follow_suggestions.friends_of_friends_longer": "Δημοφιλή μεταξύ των ατόμων που ακολουθείς",
+  "follow_suggestions.friends_of_friends_longer": "Δημοφιλές μεταξύ των ατόμων που ακολουθείς",
   "follow_suggestions.hints.featured": "Αυτό το προφίλ έχει επιλεγεί προσεκτικά από την ομάδα του {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Αυτό το προφίλ είναι δημοφιλές μεταξύ των ατόμων που ακολουθείς.",
   "follow_suggestions.hints.most_followed": "Αυτό το προφίλ είναι ένα από τα πιο ακολουθούμενα στο {domain}.",
@@ -722,8 +723,8 @@
   "follow_suggestions.hints.similar_to_recently_followed": "Αυτό το προφίλ είναι παρόμοιο με τα προφίλ που έχεις ακολουθήσει πρόσφατα.",
   "follow_suggestions.personalized_suggestion": "Εξατομικευμένη πρόταση",
   "follow_suggestions.popular_suggestion": "Δημοφιλής πρόταση",
-  "follow_suggestions.popular_suggestion_longer": "Δημοφιλή στο {domain}",
+  "follow_suggestions.popular_suggestion_longer": "Δημοφιλές στο {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοια με προφίλ που ακολούθησες πρόσφατα",
+  "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοιο με προφίλ που ακολούθησες πρόσφατα",
   "follow_suggestions.view_all": "Εμφάνιση όλων",
   "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις",
   "followed_tags": "Ακολουθούμενες ετικέτες",

app/javascript/mastodon/locales/en-GB.json

@@ -309,11 +309,8 @@
   "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
   "block_modal.show_less": "Show less",
   "block_modal.show_more": "Show more",
-  "block_modal.they_cant_mention": "They can't mention or follow you.",
-  "block_modal.they_cant_see_posts": "They can't see your posts and you won't see theirs.",
   "block_modal.they_will_know": "They can see that they're blocked.",
   "block_modal.title": "Block user?",
-  "block_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "boost_modal.reblog": "Boost post?",
   "boost_modal.undo_reblog": "Unboost post?",

app/javascript/mastodon/locales/eo.json

@@ -125,11 +125,8 @@
   "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.",
   "block_modal.show_less": "Montri malpli",
   "block_modal.show_more": "Montri pli",
-  "block_modal.they_cant_mention": "Ili ne povas mencii aŭ sekvi vin.",
-  "block_modal.they_cant_see_posts": "Ili ne povas vidi viajn afiŝojn kaj vi ne povas vidi iliajn.",
   "block_modal.they_will_know": "Ili povas vidi, ke ili estas blokita.",
   "block_modal.title": "Ĉu bloki uzanton?",
-  "block_modal.you_wont_see_mentions": "Vi ne vidos afiŝojn, ke mencii ilin.",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "boost_modal.reblog": "Ĉu diskonigi afiŝon?",
   "boost_modal.undo_reblog": "Ĉu ĉesi diskonigi afiŝon?",

app/javascript/mastodon/locales/es-AR.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Compartir en Mastodon",
   "attachments_list.unprocessed": "[sin procesar]",
   "audio.hide": "Ocultar audio",
+  "block_modal.no_collections": "Ninguno de ustedes pueden agregarse entre sí a las colecciones. Serás eliminado automáticamente de las colecciones existentes de los demás, si es aplicable.",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar los bloqueos de forma diferente. Los mensajes públicos todavía podrían estar visibles para los usuarios no conectados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar más",
-  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_mention": "No pueden mencionarse, seguirse ni citarse unos a otros.",
   "block_modal.they_cant_see_posts": "No pueden ver tus mensajes y vos no verás los suyos.",
   "block_modal.they_will_know": "Pueden ver que están bloqueados.",
   "block_modal.title": "¿Bloquear usuario?",
-  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "block_modal.you_wont_see_mentions": "No verás mensajes de otros que los mencionen.",
   "boost_modal.combo": "Podés hacer clic en {combo} para saltar esto la próxima vez",
   "boost_modal.reblog": "¿Adherir al mensaje?",
   "boost_modal.undo_reblog": "¿Dejar de adherir al mensaje?",

app/javascript/mastodon/locales/es-MX.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Compartir en Mastodon",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.no_collections": "Ninguno de los dos podrá añadirse mutuamente a las colecciones. Se les eliminará automáticamente de las colecciones existentes del otro, si procede.",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar más",
-  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_mention": "No pueden mencionarse, seguirse ni citarse entre ustedes.",
-  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
+  "block_modal.they_cant_see_posts": "Ellos no pueden ver tu contenido y tú no verás el de ellos.",
   "block_modal.they_will_know": "Pueden ver que están bloqueados.",
   "block_modal.title": "¿Deseas bloquear al usuario?",
-  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
+  "block_modal.you_wont_see_mentions": "No verás las publicaciones de otras personas en las que se les mencione.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "boost_modal.reblog": "¿Deseas impulsar la publicación?",
   "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?",

app/javascript/mastodon/locales/es.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Compartir en Mastodon",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
+  "block_modal.no_collections": "Ninguno de vosotros podrá añadirse mutuamente a colecciones. Seréis eliminados automáticamente de las colecciones mutuas de cada uno, si las hubiera.",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar más",
-  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
+  "block_modal.they_cant_mention": "No podréis mencionaros, seguiros o citaros mutuamente.",
-  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las suyas.",
+  "block_modal.they_cant_see_posts": "No podrá ver tu contenido y tú no podrás ver el suyo.",
   "block_modal.they_will_know": "Pueden ver que están bloqueados.",
   "block_modal.title": "¿Bloquear usuario?",
-  "block_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
+  "block_modal.you_wont_see_mentions": "No podrás ver publicaciones de otros donde sea mencionado.",
   "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
   "boost_modal.reblog": "¿Impulsar la publicación?",
   "boost_modal.undo_reblog": "¿Dejar de impulsar la publicación?",

app/javascript/mastodon/locales/et.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Jaga Mastodonis",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida heliriba",
+  "block_modal.no_collections": "Kumbki teist ei saa teineteist kogumikesse lisada. Vajaduse korral eemaldatakse teid automaatselt teineteise olemasolevatest kogumikest.",
   "block_modal.remote_users_caveat": "Serverile {domain} edastatakse palve otsust järgida. Ometi pole see tagatud, kuna mõned serverid võivad blokeeringuid käsitleda omal moel. Avalikud postitused võivad tuvastamata kasutajatele endiselt näha olla.",
   "block_modal.show_less": "Kuva vähem",
   "block_modal.show_more": "Kuva rohkem",
-  "block_modal.they_cant_mention": "Ta ei saa sind mainida ega jälgida.",
+  "block_modal.they_cant_mention": "Te ei saa üksteist mainida, jälgida ega tsiteerida.",
-  "block_modal.they_cant_see_posts": "Ta ei näe sinu postitusi ja sa ei näe tema omi.",
+  "block_modal.they_cant_see_posts": "Nad ei näe sinu sisu ja sina ei näe nende oma.",
   "block_modal.they_will_know": "Ta näeb, et ta on blokeeritud.",
   "block_modal.title": "Kas blokeerid kasutaja?",
-  "block_modal.you_wont_see_mentions": "Sa ei näe postitusi, mis mainivad teda.",
+  "block_modal.you_wont_see_mentions": "Sa ei näe teiste postitusi, milles neid mainitakse.",
   "boost_modal.combo": "Vajutades {combo}, saad selle edaspidi vahele jätta",
   "boost_modal.reblog": "Jagada postitust?",
   "boost_modal.undo_reblog": "Tühista postituse jagamine?",

app/javascript/mastodon/locales/eu.json

@@ -156,11 +156,8 @@
   "block_modal.remote_users_caveat": "{domain} zerbitzariari zure erabakia errespeta dezan eskatuko diogu. Halere, araua beteko den ezin da bermatu, zerbitzari batzuk modu desberdinean kudeatzen baitituzte blokeoak. Baliteke argitalpen publikoak saioa hasi ez duten erabiltzaileentzat ikusgai egotea.",
   "block_modal.show_less": "Erakutsi gutxiago",
   "block_modal.show_more": "Erakutsi gehiago",
-  "block_modal.they_cant_mention": "Ezin zaitu aipatu ezta jarraitu ere.",
-  "block_modal.they_cant_see_posts": "Ezin ditu zure bidalketak ikusi eta zuk ez dituzu bereak ikusiko.",
   "block_modal.they_will_know": "Ezin du ikusi blokeatuta duzunik.",
   "block_modal.title": "Erabiltzailea blokeatu nahi duzu?",
-  "block_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "boost_modal.combo": "{combo} sakatu dezakezu hurrengoan hau saltatzeko",
   "boost_modal.reblog": "Bultzatu bidalketa?",
   "boost_modal.undo_reblog": "Bidalketari bultzada kendu?",

app/javascript/mastodon/locales/fa.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "از کارساز {domain} خواهیم خواست که به تصمیمتان احترام بگذارد. با این حال تضمینی برای رعایتش وجود ندارد؛ زیرا برخی کارسازها ممکن است مسدودی را متفاوت مدیریت کنند. ممکن است فرسته‌های عمومی همچنان برای کاربران وارد نشده نمایان باشند.",
   "block_modal.show_less": "نمایش کم‌تر",
   "block_modal.show_more": "نمایش بیش‌تر",
-  "block_modal.they_cant_mention": "نمی‌تواند نامتان را برده یا پیتان بگیرد.",
-  "block_modal.they_cant_see_posts": "نمی‌تواند فرسته‌هایتان را ببیند و فرسته‌هایش را نمی‌بینید.",
   "block_modal.they_will_know": "می‌تواند ببینند که مسدود شده.",
   "block_modal.title": "انسداد کاربر؟",
-  "block_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "boost_modal.reblog": "تقویت فرسته؟",
   "boost_modal.undo_reblog": "ناتقویت فرسته؟",

app/javascript/mastodon/locales/fi.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Jaa Mastodonissa",
   "attachments_list.unprocessed": "(käsittelemätön)",
   "audio.hide": "Piilota ääni",
+  "block_modal.no_collections": "Kumpikaan teistä ei voi lisätä toista kokoelmiin. Sinut poistetaan automaattisesti kummankin mahdollisista olemassa olevista kokoelmista.",
   "block_modal.remote_users_caveat": "Pyydämme palvelinta {domain} kunnioittamaan päätöstäsi. Myötämielisyyttä ei kuitenkaan taata, koska jotkin palvelimet voivat käsitellä estoja eri tavalla. Julkiset julkaisut voivat silti näkyä kirjautumattomille käyttäjille.",
   "block_modal.show_less": "Näytä vähemmän",
   "block_modal.show_more": "Näytä enemmän",
-  "block_modal.they_cant_mention": "Hän ei voi enää mainita eikä seurata sinua.",
+  "block_modal.they_cant_mention": "Ette voi mainita, seurata ettekä lainata toisianne.",
-  "block_modal.they_cant_see_posts": "Hän ei voi enää nähdä julkaisujasi, etkä sinä voi nähdä hänen.",
+  "block_modal.they_cant_see_posts": "Hän ei voi nähdä sisältöäsi, etkä sinä näe enää hänen.",
   "block_modal.they_will_know": "Hän voi nähdä, että hänet on estetty.",
   "block_modal.title": "Estetäänkö käyttäjä?",
-  "block_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
+  "block_modal.you_wont_see_mentions": "Et näe enää muiden käyttäjien julkaisuja, joissa hänet mainitaan.",
   "boost_modal.combo": "Ensi kerralla voit ohittaa tämän painamalla {combo}",
   "boost_modal.reblog": "Tehostetaanko julkaisua?",
   "boost_modal.undo_reblog": "Perutaanko julkaisun tehostus?",

app/javascript/mastodon/locales/fil.json

@@ -88,10 +88,8 @@
   "audio.hide": "Itago ang tunog",
   "block_modal.show_less": "Magpakita ng mas kaunti",
   "block_modal.show_more": "Magpakita ng higit pa",
-  "block_modal.they_cant_mention": "Hindi sila makakabanggit sa iyo o sundan ka.",
   "block_modal.they_will_know": "Makita nila na hinarangan sila.",
   "block_modal.title": "Harangan ang tagagamit?",
-  "block_modal.you_wont_see_mentions": "Hindi ka makakakita ng mga post na nagbanggit sa kanila.",
   "boost_modal.combo": "Maari mong pindutin ang {combo} upang laktawan ito sa susunod na oras",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",

app/javascript/mastodon/locales/fo.json

@@ -235,11 +235,8 @@
   "block_modal.remote_users_caveat": "Vit biðja ambætaran {domain} virða tína avgerð. Kortini er eingin vissa um samsvar, av tí at fleiri ambætarar handfara blokkar ymiskt. Almennir postar kunnu framvegis vera sjónligir fyri brúkarar, sum ikki eru innritaðir.",
   "block_modal.show_less": "Vís minni",
   "block_modal.show_more": "Vís meiri",
-  "block_modal.they_cant_mention": "Tey kunnu hvørki nevna teg ella fylgja tær.",
-  "block_modal.they_cant_see_posts": "Tey síggja ikki tínar postar og tú sært ikki teirra.",
   "block_modal.they_will_know": "Tey síggja, at tey eru bannað.",
   "block_modal.title": "Banna brúkara?",
-  "block_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "boost_modal.combo": "Tú kanst trýsta á {combo} fyri at loypa uppum hetta næstu ferð",
   "boost_modal.reblog": "Stimbra post?",
   "boost_modal.undo_reblog": "Strika stimbran av posti?",

app/javascript/mastodon/locales/fr-CA.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.",
   "block_modal.show_less": "Afficher moins",
   "block_modal.show_more": "Afficher plus",
-  "block_modal.they_cant_mention": "Iel ne pourra plus vous mentionner ou vous suivre.",
-  "block_modal.they_cant_see_posts": "Iel ne pourra plus voir vos messages et vous ne verrez plus les siens.",
   "block_modal.they_will_know": "Iel pourra voir qu'iel est bloqué·e.",
   "block_modal.title": "Bloquer l'utilisateur·ice ?",
-  "block_modal.you_wont_see_mentions": "Vous ne verrez plus les messages qui le ou la mentionnent.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "boost_modal.reblog": "Partager le message ?",
   "boost_modal.undo_reblog": "Annuler le partage du message ?",

app/javascript/mastodon/locales/fr.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.",
   "block_modal.show_less": "Afficher moins",
   "block_modal.show_more": "Afficher plus",
-  "block_modal.they_cant_mention": "Iel ne pourra plus vous mentionner ou vous suivre.",
-  "block_modal.they_cant_see_posts": "Iel ne pourra plus voir vos messages et vous ne verrez plus les siens.",
   "block_modal.they_will_know": "Iel pourra voir qu'iel est bloqué·e.",
   "block_modal.title": "Bloquer l'utilisateur·ice ?",
-  "block_modal.you_wont_see_mentions": "Vous ne verrez plus les messages qui le ou la mentionnent.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "boost_modal.reblog": "Partager le message ?",
   "boost_modal.undo_reblog": "Annuler le partage du message ?",

app/javascript/mastodon/locales/fy.json

@@ -109,11 +109,8 @@
   "block_modal.remote_users_caveat": "Wy freegje de server {domain} om jo beslút te respektearjen. It neilibben hjirfan is echter net garandearre, omdat guon servers blokkaden oars ynterpretearje kinne. Iepenbiere berjochten binne mooglik noch hieltyd sichtber foar net-oanmelde brûkers.",
   "block_modal.show_less": "Minder toane",
   "block_modal.show_more": "Mear toane",
-  "block_modal.they_cant_mention": "Sy kinne jo net fermelde of folgje.",
-  "block_modal.they_cant_see_posts": "De persoan kin jo berjochten net sjen en jo ek net harren berjochten.",
   "block_modal.they_will_know": "De persoan kin sjen dat dy blokkearre wurdt.",
   "block_modal.title": "Brûker blokkearje?",
-  "block_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "boost_modal.combo": "Jo kinne op {combo} drukke om dit de folgjende kear oer te slaan",
   "boost_modal.reblog": "Berjocht booste?",
   "boost_modal.undo_reblog": "Berjocht net langer booste?",

app/javascript/mastodon/locales/ga.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Iarrfaimid ar an bhfreastalaí {domain} meas a bheith agat ar do chinneadh. Mar sin féin, ní ráthaítear comhlíonadh toisc go bhféadfadh roinnt freastalaithe bloic a láimhseáil ar bhealach difriúil. Seans go mbeidh postálacha poiblí fós le feiceáil ag úsáideoirí nach bhfuil logáilte isteach.",
   "block_modal.show_less": "Taispeáin níos lú",
   "block_modal.show_more": "Taispeáin níos mó",
-  "block_modal.they_cant_mention": "Ní féidir leo tú a lua ná a leanúint.",
-  "block_modal.they_cant_see_posts": "Ní féidir leo do chuid postálacha a fheiceáil agus ní fheicfidh tú a gcuid postanna.",
   "block_modal.they_will_know": "Is féidir leo a fheiceáil go bhfuil bac orthu.",
   "block_modal.title": "Úsáideoir a bhlocáil?",
-  "block_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "boost_modal.combo": "Is féidir leat {combo} a bhrú chun é seo a scipeáil an chéad uair eile",
   "boost_modal.reblog": "An post a threisiú?",
   "boost_modal.undo_reblog": "An deireadh a chur le postáil?",

app/javascript/mastodon/locales/gd.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
   "block_modal.show_less": "Seall nas lugha dheth",
   "block_modal.show_more": "Seall barrachd dheth",
-  "block_modal.they_cant_mention": "Chan urrainn dhaibh iomradh a thoirt ort no do leantainn.",
-  "block_modal.they_cant_see_posts": "Chan fhaic iad na postaichean agad ’s chan fhaic thu na postaichean aca-san.",
   "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
   "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
-  "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "boost_modal.reblog": "A bheil thu airson am post a bhrosnachadh?",
   "boost_modal.undo_reblog": "A bheil thu airson sgur de bhrosnachadh a’ phuist?",

app/javascript/mastodon/locales/gl.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Ímoslle pedir ao servidor {domain} que respecte a túa decisión. Emporiso, non hai garantía de que atenda a petición xa que os servidores xestionan os bloqueos de formas diferentes. As publicacións públicas poderían aínda ser visibles para usuarias que non iniciaron sesión.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar máis",
-  "block_modal.they_cant_mention": "Non te pode seguir nin mencionar.",
-  "block_modal.they_cant_see_posts": "Non pode ver as túas publicacións nin ti as de ela.",
   "block_modal.they_will_know": "Pode ver que a bloqueaches.",
   "block_modal.title": "Bloquear usuaria?",
-  "block_modal.you_wont_see_mentions": "Non verás publicacións que a mencionen.",
   "boost_modal.combo": "Preme {combo} para ignorar isto na seguinte vez",
   "boost_modal.reblog": "Promover publicación?",
   "boost_modal.undo_reblog": "Retirar promoción?",

app/javascript/mastodon/locales/he.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "אנו נבקש מהשרת {domain} לכבד את החלטתך. עם זאת, ציות למוסכמות איננו מובטח כיוון ששרתים מסויימים עשויים לטפל בחסימות בצורה אחרת. הודעות פומביות עדיין יהיו גלויות לעיני משתמשים שאינם מחוברים.",
   "block_modal.show_less": "הצג פחות",
   "block_modal.show_more": "הצג עוד",
-  "block_modal.they_cant_mention": "הם אינם יכולים לאזכר אותך או לעקוב אחריך.",
-  "block_modal.they_cant_see_posts": "הם לא יכולים לראות את הודעותיך ואתם לא תוכלו לראות את שלהם.",
   "block_modal.they_will_know": "הם יכולים לראות שהם חסומים.",
   "block_modal.title": "לחסום משתמש?",
-  "block_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "boost_modal.combo": "ניתן להקיש {combo} כדי לדלג בפעם הבאה",
   "boost_modal.reblog": "להדהד הודעה?",
   "boost_modal.undo_reblog": "להסיר הדהוד?",

app/javascript/mastodon/locales/hi.json

@@ -94,11 +94,8 @@
   "block_modal.remote_users_caveat": "हम {domain} को आपके निर्णय का सम्मान करने को कहेंगे।हालाकि इसकी आपूर्ति कि प्रत्याभूति नहीं हे। क्योंकि कुछ सर्वर ब्लॉक को अलग तरह से निभा सकते हे। अभी भी सार्वजानिक पोस्ट लोग- इन बगैर के उपयोगकर्ताओं को दिख सकती हैं।",
   "block_modal.show_less": "कम दिखाएं",
   "block_modal.show_more": "और दिखाएँ",
-  "block_modal.they_cant_mention": "वे आपको मेंशन या फॉलो नहीं कर सकते",
-  "block_modal.they_cant_see_posts": "वो आपके पोस्ट नहीं देख सकते और न आप उनके",
   "block_modal.they_will_know": "वे नहीं देख सकते कि उन्हें ब्लॉक किया गया है",
   "block_modal.title": "यूजर को ब्लॉक करें?",
-  "block_modal.you_wont_see_mentions": "वो पोस्ट आप नहीं देख सकते जिनमें उन्हें मेंशन किया गया है",
   "boost_modal.combo": "अगली बार स्किप करने के लिए आप {combo} दबा सकते है",
   "bundle_column_error.copy_stacktrace": "कॉपी एरर रिपोर्ट",
   "bundle_column_error.error.body": "अनुरोधित पेज प्रस्तुत नहीं किया जा सका। यह हमारे कोड में बग या ब्राउज़र संगतता समस्या के कारण हो सकता है।",

app/javascript/mastodon/locales/hu.json

@@ -330,11 +330,8 @@
   "block_modal.remote_users_caveat": "Arra kérjük a {domain} kiszolgálót, hogy tartsa tiszteletben a döntésedet. Ugyanakkor az együttműködés nem garantált, mivel néhány kiszolgáló másképp kezelheti a letiltásokat. A nyilvános bejegyzések a be nem jelentkezett felhasználók számára továbbra is látszódhatnak.",
   "block_modal.show_less": "Kevesebb mutatása",
   "block_modal.show_more": "Több mutatása",
-  "block_modal.they_cant_mention": "Nem említhet meg és nem követhet téged.",
-  "block_modal.they_cant_see_posts": "Nem láthatja a bejegyzéseidet, és te sem fogod látni az övéit.",
   "block_modal.they_will_know": "Láthatja, hogy le van tiltva.",
   "block_modal.title": "Letiltsuk a felhasználót?",
-  "block_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "boost_modal.combo": "Hogy átugord ezt következő alkalommal, használd {combo}",
   "boost_modal.reblog": "Bejegyzés megtolása?",
   "boost_modal.undo_reblog": "Megtolás visszavonása?",

app/javascript/mastodon/locales/ia.json

@@ -115,11 +115,8 @@
   "block_modal.remote_users_caveat": "Nos demandera al servitor {domain} de respectar tu decision. Nonobstante, le conformitate non es garantite perque alcun servitores pote tractar le blocadas de maniera differente. Le messages public pote esser totevia visibile pro le usatores non authenticate.",
   "block_modal.show_less": "Monstrar minus",
   "block_modal.show_more": "Monstrar plus",
-  "block_modal.they_cant_mention": "Le persona non pote mentionar te o sequer te.",
-  "block_modal.they_cant_see_posts": "Iste persona non potera vider tu messages e tu non videra le sues.",
   "block_modal.they_will_know": "Le persona pote saper de esser blocate.",
   "block_modal.title": "Blocar usator?",
-  "block_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "boost_modal.combo": "Tu pote premer {combo} pro saltar isto le proxime vice",
   "boost_modal.reblog": "Impulsar le message?",
   "boost_modal.undo_reblog": "Cessar de impulsar le message?",

app/javascript/mastodon/locales/id.json

@@ -92,11 +92,8 @@
   "block_modal.remote_users_caveat": "Kami akan meminta {domain} server untuk menghargai keputusan Anda. Namun, kepatuhan tak dapat dipastikan karena beberapa server dapat menangani blokir secara beragam. Postingan publik masih dapat terlihat oleh pengguna tanpa masuk.",
   "block_modal.show_less": "Tampilkan lebih sedikit",
   "block_modal.show_more": "Tampilkan lebih banyak",
-  "block_modal.they_cant_mention": "Mereka tidak dapat menyebut atau mengikuti Anda.",
-  "block_modal.they_cant_see_posts": "Mereka tidak dapat melihat postingan Anda dan Anda tidak dapat melihat postingan mereka.",
   "block_modal.they_will_know": "Mereka dapat melihat bahwa mereka diblokir.",
   "block_modal.title": "Blokir pengguna?",
-  "block_modal.you_wont_see_mentions": "Anda tidak akan melihat kiriman yang menyebutkan mereka.",
   "boost_modal.combo": "Anda dapat menekan {combo} untuk melewati ini",
   "boost_modal.reblog": "Pacu kiriman?",
   "boost_modal.undo_reblog": "Jangan pacu kiriman?",

app/javascript/mastodon/locales/ie.json

@@ -80,11 +80,8 @@
   "block_modal.remote_users_caveat": "Noi va petir que li servitor {domain} mey respecter tui decision. Támen, obedientie ne es garantit pro que chascun servitor gere bloccas diferentmen. Possibilmen public postas va restar visibil a usatores de inloggat.",
   "block_modal.show_less": "Monstrar minu",
   "block_modal.show_more": "Monstrar plu",
-  "block_modal.they_cant_mention": "Ne posse mentionar ni sequer te.",
-  "block_modal.they_cant_see_posts": "Ne posse vider tui postas e inversi.",
   "block_modal.they_will_know": "Va esser conscient que tu ha bloccat.",
   "block_modal.title": "Bloccar usator?",
-  "block_modal.you_wont_see_mentions": "Tu ne va vider postas mentionant li usator.",
   "boost_modal.combo": "Li proxim vez tu posse pressar {combo} por passar to-ci",
   "bundle_column_error.copy_stacktrace": "Copiar erra-raporte",
   "bundle_column_error.error.body": "Li demandat págine ne posset esser rendit. Fórsan it es un problema in nor code, o un problema de compatibilitá con li navigator.",

app/javascript/mastodon/locales/io.json

@@ -174,11 +174,8 @@
   "block_modal.remote_users_caveat": "Ni questionos {domain} di la servilo por respektar vua decido. Publika posti forsan ankore estas videbla a neenirinta uzanti.",
   "block_modal.show_less": "Montrar mine",
   "block_modal.show_more": "Montrar plu",
-  "block_modal.they_cant_mention": "Oli ne povas mencionar o sequar vu.",
-  "block_modal.they_cant_see_posts": "Oli ne povas vidar vua mesaji e vu ne vidos vidar olia.",
   "block_modal.they_will_know": "Oli povas vidar ke oli esas blokusita.",
   "block_modal.title": "Blokusar uzanto?",
-  "block_modal.you_wont_see_mentions": "Vu ne vidos mesaji qua mencionas oli.",
   "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
   "boost_modal.reblog": "Ka repetar posto?",
   "boost_modal.undo_reblog": "Ka desrepetar posto?",

app/javascript/mastodon/locales/is.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Við munum biðja {domain} netþjóninn um að virða ákvörðun þína. Hitt er svo annað mál hvort hann fari eftir þessu, ekki er hægt að tryggja eftirfylgni því sumir netþjónar meðhöndla útilokanir á sinn hátt. Opinberar færslur gætu verið sýnilegar notendum sem ekki eru skráðir inn.",
   "block_modal.show_less": "Sýna minna",
   "block_modal.show_more": "Sýna meira",
-  "block_modal.they_cant_mention": "Viðkomandi geta ekki minnst á þig eða fylgst með þér.",
-  "block_modal.they_cant_see_posts": "Viðkomandi geta ekki séð færslurnar þínar og þú ekki þeirra.",
   "block_modal.they_will_know": "Viðkomandi geta séð að þeir eru útilokaðir.",
   "block_modal.title": "Útiloka notanda?",
-  "block_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "boost_modal.combo": "Þú getur ýtt á {combo} til að sleppa þessu næst",
   "boost_modal.reblog": "Endurbirta færslu?",
   "boost_modal.undo_reblog": "Taka færslu úr endurbirtingu?",

app/javascript/mastodon/locales/it.json

@@ -331,11 +331,10 @@
   "block_modal.remote_users_caveat": "Chiederemo al server {domain} di rispettare la tua decisione. Tuttavia, la conformità non è garantita poiché alcuni server potrebbero gestire i blocchi in modo diverso. I post pubblici potrebbero essere ancora visibili agli utenti che non hanno effettuato l'accesso.",
   "block_modal.show_less": "Mostra meno",
   "block_modal.show_more": "Mostra di più",
-  "block_modal.they_cant_mention": "Non possono menzionarti o seguirti.",
+  "block_modal.they_cant_mention": "Non potete menzionarvi, seguirvi o citarvi a vicenda.",
-  "block_modal.they_cant_see_posts": "Non possono vedere i tuoi post e tu non vedrai i loro.",
+  "block_modal.they_cant_see_posts": "Non possono vedere i tuoi contenuti e tu non vedrai i loro.",
   "block_modal.they_will_know": "Possono vedere che sono bloccati.",
   "block_modal.title": "Bloccare l'utente?",
-  "block_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "boost_modal.combo": "Puoi premere {combo} per saltare questo passaggio, la prossima volta",
   "boost_modal.reblog": "Condividere il post?",
   "boost_modal.undo_reblog": "Annullare la condivisione del post?",

app/javascript/mastodon/locales/ja.json

@@ -156,11 +156,8 @@
   "block_modal.remote_users_caveat": "このサーバーはあなたのブロックの意思を尊重するように {domain} へ通知します。しかし、サーバーによってはブロック機能の扱いが異なる場合もありえるため、相手のサーバー側で求める通りの処理が行われる確証はありません。また、公開投稿はユーザーがログアウト状態であれば閲覧できる可能性があります。",
   "block_modal.show_less": "表示を減らす",
   "block_modal.show_more": "続きを表示",
-  "block_modal.they_cant_mention": "相手はあなたへの返信やフォローができなくなります。",
-  "block_modal.they_cant_see_posts": "相手はあなたの投稿を閲覧できなくなり、あなたも相手の投稿を閲覧できなくなります。",
   "block_modal.they_will_know": "ブロックは相手からわかります。",
   "block_modal.title": "ユーザーをブロックしますか？",
-  "block_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "boost_modal.combo": "次からは{combo}を押せばスキップできます",
   "boost_modal.reblog": "ブーストしますか？",
   "boost_modal.undo_reblog": "ブーストを解除しますか？",

app/javascript/mastodon/locales/kab.json

@@ -214,10 +214,7 @@
   "audio.hide": "Ffer amesli",
   "block_modal.show_less": "Ssken-d drus",
   "block_modal.show_more": "Ssken-d ugar",
-  "block_modal.they_cant_mention": "Ur zmiren ad k·m-id-bedren, ur zmiren ad k·m-ḍefren.",
-  "block_modal.they_cant_see_posts": "Ur yezmir ad wali tisuffaɣ-ik·im, ur tettwaliḍ tidak-is.",
   "block_modal.title": "Sewḥel aseqdac ?",
-  "block_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
   "boost_modal.combo": "Tzemreḍ ad tsiteḍ ɣef {combo} akken ad tzegleḍ aya tikelt i d-iteddun",
   "boost_modal.reblog": "Zuzer tasuffeɣt?",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",

app/javascript/mastodon/locales/ko.json

@@ -188,11 +188,8 @@
   "block_modal.remote_users_caveat": "우리는 {domain} 서버가 당신의 결정을 존중해 주길 부탁할 것입니다. 하지만 몇몇 서버는 차단을 다르게 취급할 수 있기 때문에 규정이 준수되는 것을 보장할 수는 없습니다. 공개 게시물은 로그인 하지 않은 사용자들에게 여전히 보여질 수 있습니다.",
   "block_modal.show_less": "간략히 보기",
   "block_modal.show_more": "더 보기",
-  "block_modal.they_cant_mention": "나를 멘션하거나 팔로우 할 수 없습니다.",
-  "block_modal.they_cant_see_posts": "상대방이 내 게시물을 볼 수 없게 되며 나도 상대방의 게시물을 볼 수 없게 됩니다.",
   "block_modal.they_will_know": "자신이 차단 당했다는 사실을 확인할 수 있습니다.",
   "block_modal.title": "사용자를 차단할까요?",
-  "block_modal.you_wont_see_mentions": "해당 사용자를 멘션한 게시물이 보이지 않게 됩니다.",
   "boost_modal.combo": "다음엔 {combo}를 눌러서 이 과정을 건너뛸 수 있습니다",
   "boost_modal.reblog": "게시물을 부스트할까요?",
   "boost_modal.undo_reblog": "게시물을 부스트 취소할까요?",

app/javascript/mastodon/locales/la.json

@@ -54,7 +54,6 @@
   "alert.unexpected.message": "Error inopinatus occurrit.",
   "announcement.announcement": "Proclamatio",
   "attachments_list.unprocessed": "(immūtātus)",
-  "block_modal.you_wont_see_mentions": "Nuntios quibus eos commemorant non videbis.",
   "boost_modal.combo": "Potes premēre {combo} ut hoc iterum transilīre",
   "bundle_column_error.error.title": "Eheu!",
   "bundle_column_error.retry": "Retemptare",

app/javascript/mastodon/locales/lad.json

@@ -108,10 +108,8 @@
   "audio.hide": "Eskonde audio",
   "block_modal.show_less": "Amostra manko",
   "block_modal.show_more": "Amostra mas",
-  "block_modal.they_cant_mention": "No te puede enmentar ni segir.",
   "block_modal.they_will_know": "Puede ver ke esta blokado.",
   "block_modal.title": "Bloka utilizador?",
-  "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "boost_modal.reblog": "Repartajar puvlikasyon?",
   "boost_modal.undo_reblog": "Departajar puvlikasyon?",

app/javascript/mastodon/locales/lt.json

@@ -151,11 +151,8 @@
   "block_modal.remote_users_caveat": "Paprašysime serverio {domain} gerbti tavo sprendimą. Tačiau atitiktis negarantuojama, nes kai kurie serveriai gali skirtingai tvarkyti blokavimus. Vieši įrašai vis tiek gali būti matomi neprisijungusiems naudotojams.",
   "block_modal.show_less": "Rodyti mažiau",
   "block_modal.show_more": "Rodyti daugiau",
-  "block_modal.they_cant_mention": "Jie negali tau parašyti ar sekti.",
-  "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
   "block_modal.they_will_know": "Jie gali matyti, kad yra užblokuoti.",
   "block_modal.title": "Blokuoti naudotoją?",
-  "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
   "boost_modal.reblog": "Pasidalinti įrašą?",
   "boost_modal.undo_reblog": "Nebepasidalinti įrašo?",

app/javascript/mastodon/locales/lv.json

@@ -179,11 +179,8 @@
   "block_modal.remote_users_caveat": "Mēs lūgsim serverim {domain} ņemt vērā Tavu lēmumu. Tomēr sadarbība nav garantēta, jo atsevišķi serveri bloķēšanu var apstrādāt citādi. Publiski ieraksti, iespējams, joprojām būs redzami lietotājiem, kuri nav pieteikušies.",
   "block_modal.show_less": "Rādīt mazāk",
   "block_modal.show_more": "Rādīt vairāk",
-  "block_modal.they_cant_mention": "Lietotājs nevarēs Tevi pieminēt vai Tev sekot.",
-  "block_modal.they_cant_see_posts": "Lietotājs nevarēs redzēt Tavus, un Tu neredzēsi lietotāja ierakstus.",
   "block_modal.they_will_know": "Lietotājs varēs redzēt, ka ir bloķēts.",
   "block_modal.title": "Bloķēt lietotāju?",
-  "block_modal.you_wont_see_mentions": "Tu neredzēsi ierakstus, kuros ir minēts šis lietotājs.",
   "boost_modal.combo": "Nospied {combo}, lai nākamreiz šo izlaistu",
   "boost_modal.reblog": "Pastiprināt ierakstu?",
   "boost_modal.undo_reblog": "Atcelt ieraksta pastiprināšanu?",

app/javascript/mastodon/locales/ms.json

@@ -102,11 +102,8 @@
   "block_modal.remote_users_caveat": "Kami akan meminta pelayan {domain} untuk menghormati keputusan anda. Bagaimanapun, pematuhan tidak dijamin kerana ada pelayan yang mungkin menangani sekatan dengan cara berbeza. Hantaran awam mungkin masih tampak kepada pengguna yang tidak log masuk.",
   "block_modal.show_less": "Tunjuk kurang",
   "block_modal.show_more": "Tunjuk lebih",
-  "block_modal.they_cant_mention": "Dia tidak boleh menyebut tentang anda atau mengikut anda.",
-  "block_modal.they_cant_see_posts": "Dia tidak boleh melihat hantaran anda dan sebaliknya.",
   "block_modal.they_will_know": "Dia boleh lihat bahawa dia disekat.",
   "block_modal.title": "Sekat pengguna?",
-  "block_modal.you_wont_see_mentions": "Anda tidak akan melihat hantaran yang menyebut tentangnya.",
   "boost_modal.combo": "Anda boleh tekan {combo} untuk melangkauinya pada waktu lain",
   "boost_modal.reblog": "Galakkan hantaran?",
   "boost_modal.undo_reblog": "Nyahgalakkan hantaran?",

app/javascript/mastodon/locales/nan-TW.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Guán ē要求服侍器 {domain} 尊重lí ê決定。但是bô法度保證ta̍k ê服侍器lóng遵守，因為tsi̍t-kuá服侍器huân-sè用別款方法處理封鎖。公開ê PO文可能iáu是ē hōo bô登入ê用者看著。",
   "block_modal.show_less": "看khah少",
   "block_modal.show_more": "顯示其他ê內容",
-  "block_modal.they_cant_mention": "In buē-tàng 提起á是跟tuè lí。",
-  "block_modal.they_cant_see_posts": "Lín buē-tàng互相看著對方ê PO文。",
   "block_modal.they_will_know": "In通看見in hőng封鎖。",
   "block_modal.title": "Kám beh封鎖用者？",
-  "block_modal.you_wont_see_mentions": "Lí buē看見提起in ê PO文。",
   "boost_modal.combo": "後擺lí thang tshi̍h {combo} 跳過",
   "boost_modal.reblog": "Kám beh轉PO？",
   "boost_modal.undo_reblog": "Kám beh取消轉PO？",

app/javascript/mastodon/locales/ne.json

@@ -75,10 +75,8 @@
   "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
   "block_modal.show_less": "कम देखाउनुहोस्",
   "block_modal.show_more": "थप देखाउनुहोस्",
-  "block_modal.they_cant_mention": "तिनीहरूले तपाईंलाई उल्लेख गर्न वा फलो गर्न सक्दैनन्।",
   "block_modal.they_will_know": "उनीहरूले उनीहरू ब्लक गरिएको देख्न सक्छन्।",
   "block_modal.title": "प्रयोगकर्तालाई ब्लक गर्ने?",
-  "block_modal.you_wont_see_mentions": "तपाईंले तिनीहरूलाई उल्लेख गरिएका पोस्टहरू देख्नुहुने छैन।",
   "boost_modal.reblog": "पोस्ट बुस्ट गर्ने?",
   "boost_modal.undo_reblog": "पोस्ट अनबुस्ट गर्ने?",
   "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्",

app/javascript/mastodon/locales/nl.json

@@ -223,6 +223,8 @@
   "account_edit.profile_tab.show_media.title": "Tabblad 'Media' tonen",
   "account_edit.profile_tab.show_media_replies.description": "Wanneer dit is ingeschakeld, worden op het tabblad Media zowel jouw berichten en reacties op berichten van anderen weergegeven.",
   "account_edit.profile_tab.show_media_replies.title": "Jouw reacties aan het tabblad 'Media' toevoegen",
+  "account_edit.profile_tab.show_relations.title": "‘Volgers’ en ‘Gevolgde accounts’ tonen",
+  "account_edit.profile_tab.title": "Weergave-instellingen profiel",
   "account_edit.save": "Opslaan",
   "account_edit.upload_modal.back": "Terug",
   "account_edit.upload_modal.done": "Klaar",
@@ -325,11 +327,8 @@
   "block_modal.remote_users_caveat": "We vragen de server {domain} om je besluit te respecteren. Het naleven hiervan is echter niet gegarandeerd, omdat sommige servers blokkades anders kunnen interpreteren. Openbare berichten zijn mogelijk nog steeds zichtbaar voor niet-ingelogde gebruikers.",
   "block_modal.show_less": "Minder tonen",
   "block_modal.show_more": "Meer tonen",
-  "block_modal.they_cant_mention": "De persoon kan jou niet vermelden of volgen.",
-  "block_modal.they_cant_see_posts": "De persoon kan jouw berichten niet zien en jij ook niet diens berichten.",
   "block_modal.they_will_know": "De persoon kan zien dat die wordt geblokkeerd.",
   "block_modal.title": "Gebruiker blokkeren?",
-  "block_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "boost_modal.combo": "Je kunt {combo} klikken om dit de volgende keer over te slaan",
   "boost_modal.reblog": "Bericht boosten?",
   "boost_modal.undo_reblog": "Bericht niet langer boosten?",
@@ -749,7 +748,7 @@
   "hashtag.column_settings.tag_mode.all": "Allemaal",
   "hashtag.column_settings.tag_mode.any": "Een van deze",
   "hashtag.column_settings.tag_mode.none": "Geen van deze",
-  "hashtag.column_settings.tag_toggle": "Additionele tags aan deze kolom toevoegen",
+  "hashtag.column_settings.tag_toggle": "Extra tags aan deze kolom toevoegen",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} deelnemer} other {{counter} deelnemers}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} bericht} other {{counter} berichten}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} bericht} other {{counter} berichten}} vandaag",
@@ -1128,7 +1127,7 @@
   "report.mute": "Negeren",
   "report.mute_explanation": "Je kunt diens berichten niet zien. Je kunt nog wel gevolgd worden en jouw berichten zijn nog zichtbaar, maar diegene kan niet zien dat die wordt genegeerd.",
   "report.next": "Volgende",
-  "report.placeholder": "Extra opmerkingen",
+  "report.placeholder": "Aanvullende opmerkingen",
   "report.reasons.dislike": "Ik vind het niet leuk",
   "report.reasons.dislike_description": "Het is iets wat je niet wilt zien",
   "report.reasons.legal": "Het is wettelijk niet toegestaan",

app/javascript/mastodon/locales/nn.json

@@ -313,11 +313,8 @@
   "block_modal.remote_users_caveat": "Me vil be tenaren {domain} om å respektera di avgjerd. Me kan ikkje garantera at det vert gjort, sidan nokre tenarar kan handtera blokkering ulikt. Offentlege innlegg kan framleis vera synlege for ikkje-innlogga brukarar.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis meir",
-  "block_modal.they_cant_mention": "Dei kan ikkje nemna eller fylgja deg.",
-  "block_modal.they_cant_see_posts": "Dei kan ikkje sjå innlegga dine, og du vil ikkje sjå deira.",
   "block_modal.they_will_know": "Dei kan sjå at dei er blokkerte.",
   "block_modal.title": "Blokker brukaren?",
-  "block_modal.you_wont_see_mentions": "Du ser ikkje innlegg som nemner dei.",
   "boost_modal.combo": "Du kan trykkja {combo} for å hoppa over dette neste gong",
   "boost_modal.reblog": "Framhev innlegget?",
   "boost_modal.undo_reblog": "Fjern framhevinga?",

app/javascript/mastodon/locales/no.json

@@ -177,11 +177,8 @@
   "block_modal.remote_users_caveat": "Vi vil be serveren {domain} om å respektere din beslutning. Det er imidlertid ingen garanti at det blir overholdt, siden noen servere kan håndtere blokkeringer på forskjellig vis. Offentlige innlegg kan fortsatt være synlige for ikke-innloggede brukere.",
   "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis mer",
-  "block_modal.they_cant_mention": "De kan ikke nevne eller følge deg.",
-  "block_modal.they_cant_see_posts": "De kan ikke se dine innlegg og du kommer ikke til å se deres.",
   "block_modal.they_will_know": "De kan se at de er blitt blokkert.",
   "block_modal.title": "Blokker bruker?",
-  "block_modal.you_wont_see_mentions": "Du kommer ikke til å se innlegg som nevner dem.",
   "boost_modal.combo": "You kan trykke {combo} for å hoppe over dette neste gang",
   "boost_modal.reblog": "Fremhev innlegg?",
   "boost_modal.undo_reblog": "Fjern fremheving?",

app/javascript/mastodon/locales/pl.json

@@ -237,11 +237,8 @@
   "block_modal.remote_users_caveat": "Poprosimy serwer {domain} o uszanowanie twojej decyzji. Nie jest to jednak gwarantowane, bo niektóre serwery mogą obsługiwać blokady w inny sposób. Publiczne wpisy mogą być nadal widoczne dla niezalogowanych użytkowników.",
   "block_modal.show_less": "Pokaż mniej",
   "block_modal.show_more": "Pokaż więcej",
-  "block_modal.they_cant_mention": "Nie może cię wzmiankować ani obserwować.",
-  "block_modal.they_cant_see_posts": "Nie zobaczycie wzajemnie swoich wpisów.",
   "block_modal.they_will_know": "Zobaczy informację o blokadzie.",
   "block_modal.title": "Zablokować?",
-  "block_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które zawierają wzmianki o tej osobie.",
   "boost_modal.combo": "Możesz kliknąć {combo}, aby pominąć tę czynność następnym razem",
   "boost_modal.reblog": "Podbić wpis?",
   "boost_modal.undo_reblog": "Cofnąć podbicie?",

app/javascript/mastodon/locales/pt-BR.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Pediremos ao servidor {domain} que respeite sua decisão. No entanto, a conformidade não é garantida, já que alguns servidores podem lidar com bloqueios de maneira diferente. As publicações abertas ainda podem estar visíveis para usuários não logados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
-  "block_modal.they_cant_mention": "Não poderá mencionar ou seguir você.",
-  "block_modal.they_cant_see_posts": "Não poderá ver suas publicações e você não verá as dele/a.",
   "block_modal.they_will_know": "Poderá ver que você bloqueou.",
   "block_modal.title": "Bloquear usuário?",
-  "block_modal.you_wont_see_mentions": "Você não verá publicações que mencionem este usuário.",
   "boost_modal.combo": "Pressione {combo} para pular isto na próxima vez",
   "boost_modal.reblog": "Impulsionar a publicação?",
   "boost_modal.undo_reblog": "Retirar o impulso da publicação?",

app/javascript/mastodon/locales/pt-PT.json

@@ -314,11 +314,8 @@
   "block_modal.remote_users_caveat": "Solicitaremos ao servidor {domain} que respeite a sua decisão. No entanto, o cumprimento não é garantido, sendo que alguns servidores podem gerir bloqueios de forma diferente. As publicações públicas podem continuar visíveis para utilizadores não autenticados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
-  "block_modal.they_cant_mention": "Ele não o pode mencionar nem seguir.",
-  "block_modal.they_cant_see_posts": "Eles não podem ver as suas publicações e você não verá as deles.",
   "block_modal.they_will_know": "Ele pode ver que o bloqueaste.",
   "block_modal.title": "Bloquear utilizador?",
-  "block_modal.you_wont_see_mentions": "Não verás publicações que mencionem este utilizador.",
   "boost_modal.combo": "Pode clicar em {combo} para não voltar a ver isto",
   "boost_modal.reblog": "Partilhar a publicação?",
   "boost_modal.undo_reblog": "Deixar de partilhar a publicação?",

app/javascript/mastodon/locales/ru.json

@@ -287,11 +287,8 @@
   "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако нельзя гарантировать, что он будет соблюдать блокировку, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.",
   "block_modal.show_less": "Показать меньше",
   "block_modal.show_more": "Показать больше",
-  "block_modal.they_cant_mention": "Он не сможет ни упоминать вас, ни подписаться на вас.",
-  "block_modal.they_cant_see_posts": "Он не сможет видеть ваши посты, а вы не будете видеть его посты.",
   "block_modal.they_will_know": "Он будет знать, что вы его блокируете.",
   "block_modal.title": "Заблокировать пользователя?",
-  "block_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "boost_modal.reblog": "Продвинуть пост?",
   "boost_modal.undo_reblog": "Отменить продвижение?",

app/javascript/mastodon/locales/ry.json

@@ -76,11 +76,8 @@
   "block_modal.remote_users_caveat": "Попросиме ґазду сервера {domain} честовати вашоє рішеня. Айбо не ґарантуєме повный соглас, бо даякі серверы можут брати блокованя по-инчакому. Публичні дописы годно быти видко незалоґованым хосновачам.",
   "block_modal.show_less": "Указати менше",
   "block_modal.show_more": "Указати бульше",
-  "block_modal.they_cant_mention": "Они не можут вас споминати авадь слідовати.",
-  "block_modal.they_cant_see_posts": "Они не можут видіти ваші публикації, тай наспак — вы йихні.",
   "block_modal.they_will_know": "Они видят, ож сут заблоковані.",
   "block_modal.title": "Заблоковати хосновача?",
-  "block_modal.you_wont_see_mentions": "Не будете видіти публикації тай споминкы сього хосновача.",
   "boost_modal.combo": "Можете клынцнути {combo} другый раз обы сесе пропустити",
   "bundle_column_error.copy_stacktrace": "Укопіровати звіт за хыбу",
   "bundle_column_error.error.body": "Не годни сьме указати зажадану сторунку. Годно быти спозад хыбы у нашум сістемі, авадь проблемы зумісности бравзера.",

app/javascript/mastodon/locales/sc.json

@@ -105,11 +105,8 @@
   "block_modal.remote_users_caveat": "Amus a pedire a su serbidore {domain} de rispetare sa detzisione tua. Nointames custu, su rispetu no est garantidu ca unos cantos serbidores diant pòdere gestire is blocos de manera diferente. Is publicatzione pùblicas diant pòdere ancora èssere visìbiles a is utentes chi no ant fatu s'atzessu.",
   "block_modal.show_less": "Ammustra·nde prus pagu",
   "block_modal.show_more": "Ammustra·nde prus",
-  "block_modal.they_cant_mention": "Non ti podent mentovare nen sighire.",
-  "block_modal.they_cant_see_posts": "Non podent bìdere is publicatziones tuas e tue non podes bìdere cussas issoro.",
   "block_modal.they_will_know": "Non podent bìdere chi ddos as blocadu.",
   "block_modal.title": "Boles blocare s'utente?",
-  "block_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent custa persone.",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
   "boost_modal.reblog": "Boles potentziare sa publicatzione?",
   "boost_modal.undo_reblog": "Boles tzessare de potentziare sa publicatzione?",

app/javascript/mastodon/locales/sco.json

@@ -64,8 +64,6 @@
   "attachments_list.unprocessed": "(No processed)",
   "audio.hide": "Stow audio",
   "block_modal.remote_users_caveat": "We will ask the server {domain} tae respect yer decision. Awtho mind compliance isnae a guarantee, sin some servers may haundle blocks differently. Public posts may yet be visible tae non-loggit-in uisers.",
-  "block_modal.they_cant_mention": "Thay cannae mention or follae you.",
-  "block_modal.they_cant_see_posts": "Thay cannae see yer posts and you willnae see thairs.",
   "block_modal.they_will_know": "Thay can see that they're blockit.",
   "block_modal.title": "Block uiser?",
   "boost_modal.combo": "Ye kin chap {combo} tae dingie this neist tim",

app/javascript/mastodon/locales/si.json

@@ -107,11 +107,8 @@
   "block_modal.remote_users_caveat": "ඔබගේ තීරණයට ගරු කරන ලෙස අපි සේවාදායකයාගෙන් {domain} ඉල්ලා සිටිමු. කෙසේ වෙතත්, සමහර සේවාදායකයන් අවහිර කිරීම් වෙනස් ලෙස හසුරුවන බැවින් අනුකූලතාව සහතික නොවේ. පොදු පළ කිරීම් තවමත් ලොග් වී නොමැති පරිශීලකයින්ට දෘශ්‍යමාන විය හැකිය.",
   "block_modal.show_less": "අඩුවෙන් පෙන්වන්න",
   "block_modal.show_more": "තව පෙන්වන්න",
-  "block_modal.they_cant_mention": "ඔවුන්ට ඔබව සඳහන් කිරීමට හෝ අනුගමනය කිරීමට නොහැකිය.",
-  "block_modal.they_cant_see_posts": "ඔවුන්ට ඔබේ සටහන් දැකිය නොහැකි අතර ඔබට ඔවුන්ගේ සටහන් නොපෙනේ.",
   "block_modal.they_will_know": "අවහිර කළ බව දකිනු ඇත.",
   "block_modal.title": "අවහිර කරන්නද?",
-  "block_modal.you_wont_see_mentions": "ඒවා සඳහන් කරන සටහන් ඔබට නොපෙනේ.",
   "boost_modal.combo": "ඊළඟ වතාවේ මෙය මඟ හැරීමට {combo} එබීමට හැකිය",
   "boost_modal.reblog": "පළ කිරීම වැඩි කරන්නද?",
   "boost_modal.undo_reblog": "පළ කිරීම බූස්ට් නොකරන්නද?",

app/javascript/mastodon/locales/sk.json

@@ -122,11 +122,8 @@
   "block_modal.remote_users_caveat": "Požiadame server {domain} o rešpektovanie vášho rozhodnutia. Nevieme to však zaručiť, keďže niektoré servery pristupujú k blokovaniu inak. Verejné príspevky sa stále môžu zobrazovať neprihláseným ľuďom.",
   "block_modal.show_less": "Zobraziť menej",
   "block_modal.show_more": "Zobraziť viac",
-  "block_modal.they_cant_mention": "Nemôžu ťa spomenúť, alebo nasledovať.",
-  "block_modal.they_cant_see_posts": "On/a nemôže vidieť tvoje príspevky a ty neuvidíš jej/ho.",
   "block_modal.they_will_know": "Môžu vidieť, že sú zablokovaní/ý.",
   "block_modal.title": "Blokovať užívateľa?",
-  "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
   "boost_modal.reblog": "Zdieľať príspevok?",
   "boost_modal.undo_reblog": "Zrušiť zdieľanie?",

app/javascript/mastodon/locales/sl.json

@@ -131,11 +131,8 @@
   "block_modal.remote_users_caveat": "Strežnik {domain} bomo pozvali, naj spoštuje vašo odločitev. Kljub temu pa ni gotovo, da bo strežnik prošnjo upošteval, saj nekateri strežniki blokiranja obravnavajo drugače. Javne objave bodo morda še vedno vidne neprijavljenim uporabnikom.",
   "block_modal.show_less": "Pokaži manj",
   "block_modal.show_more": "Pokaži več",
-  "block_modal.they_cant_mention": "Ne more vas omenjati ali vam slediti.",
-  "block_modal.they_cant_see_posts": "Ne vidi vaših objav, vi pa ne njegovih.",
   "block_modal.they_will_know": "Ne more videti, da je blokiran.",
   "block_modal.title": "Blokiram uporabnika?",
-  "block_modal.you_wont_see_mentions": "Objav, ki ga omenjajo, ne boste videli.",
   "boost_modal.combo": "Če želite naslednjič to preskočiti, lahko pritisnete {combo}",
   "boost_modal.reblog": "Izpostavim objavo?",
   "boost_modal.undo_reblog": "Ali želite preklicati izpostavitev objave?",

app/javascript/mastodon/locales/sq.json

@@ -327,11 +327,8 @@
   "block_modal.remote_users_caveat": "Do t’i kërkojmë shërbyesit {domain} të respektojë vendimin tuaj. Por, pajtimi s’është i garantuar, ngaqë disa shërbyes mund t’i trajtojnë ndryshe bllokimet. Psotimet publike mundet të jenë ende të dukshme për përdorues pa bërë hyrje në llogari.",
   "block_modal.show_less": "Shfaq më pak",
   "block_modal.show_more": "Shfaq më tepër",
-  "block_modal.they_cant_mention": "S’mund t’u përmendin, ose t’ju ndjekin.",
-  "block_modal.they_cant_see_posts": "S’mund të shohin postimet tuaja dhe as ju të tyret.",
   "block_modal.they_will_know": "Mund të shohin se janë bllokuar.",
   "block_modal.title": "Të bllokohet përdoruesi?",
-  "block_modal.you_wont_see_mentions": "S’do të shihni postimet ku përmenden.",
   "boost_modal.combo": "Që kjo të anashkalohet herës tjetër, mund të shtypni {combo}",
   "boost_modal.reblog": "Përforcim postimi?",
   "boost_modal.undo_reblog": "Të hiqet përforcim për postimin?",

app/javascript/mastodon/locales/sr-Latn.json

@@ -106,11 +106,8 @@
   "block_modal.remote_users_caveat": "Zamolićemo server {domain} da poštuje vašu odluku. Međutim, usklađenost nije zagarantovana jer neki serveri mogu drugačije da obrađuju blokove. Javne objave mogu i dalje biti vidljive korisnicima koji nisu prijavljeni.",
   "block_modal.show_less": "Prikaži manje",
   "block_modal.show_more": "Prikaži više",
-  "block_modal.they_cant_mention": "Ne mogu da vas pominju ili prate.",
-  "block_modal.they_cant_see_posts": "Ne mogu da vide vaše objave, a vi nećete videti njihove.",
   "block_modal.they_will_know": "Mogu da vide da su blokirani.",
   "block_modal.title": "Blokirati korisnika?",
-  "block_modal.you_wont_see_mentions": "Nećete videti objave koje ih pominju.",
   "boost_modal.combo": "Možete pritisnuti {combo} da preskočite ovo sledeći put",
   "bundle_column_error.copy_stacktrace": "Kopiraj izveštaj o grešci",
   "bundle_column_error.error.body": "Nije moguće prikazati traženu stranicu. Razlog može biti greška u našem kodu ili problem sa kompatibilnošću pretraživača.",

app/javascript/mastodon/locales/sr.json

@@ -83,11 +83,8 @@
   "block_modal.remote_users_caveat": "Замолићемо сервер {domain} да поштује вашу одлуку. Међутим, усклађеност није загарантована јер неки сервери могу другачије да обрађују блокове. Јавне објаве могу и даље бити видљиве корисницима који нису пријављени.",
   "block_modal.show_less": "Прикажи мање",
   "block_modal.show_more": "Прикажи више",
-  "block_modal.they_cant_mention": "Не могу да вас помињу или прате.",
-  "block_modal.they_cant_see_posts": "Не могу да виде ваше објаве, а ви нећете видети њихове.",
   "block_modal.they_will_know": "Могу да виде да су блокирани.",
   "block_modal.title": "Блокирати корисника?",
-  "block_modal.you_wont_see_mentions": "Нећете видети објаве које их помињу.",
   "boost_modal.combo": "Можете притиснути {combo} да прескочите ово следећи пут",
   "bundle_column_error.copy_stacktrace": "Копирај извештај о грешци",
   "bundle_column_error.error.body": "Није могуће приказати тражену страницу. Разлог може бити грешка у нашем коду или проблем са компатибилношћу претраживача.",

app/javascript/mastodon/locales/sv.json

@@ -324,11 +324,8 @@
   "block_modal.remote_users_caveat": "Vi kommer att be servern {domain} att respektera ditt beslut. Dock garanteras inte efterlevnad eftersom vissa servrar kan hantera blockeringar på olika sätt. Offentliga inlägg kan fortfarande vara synliga för icke-inloggade användare.",
   "block_modal.show_less": "Visa mindre",
   "block_modal.show_more": "Visa mer",
-  "block_modal.they_cant_mention": "De kan inte nämna eller följa dig.",
-  "block_modal.they_cant_see_posts": "De kan inte se dina inlägg och du kan inte se deras.",
   "block_modal.they_will_know": "De kan se att de är blockerade.",
   "block_modal.title": "Blockera användare?",
-  "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
   "boost_modal.reblog": "Boosta inlägg?",
   "boost_modal.undo_reblog": "Avboosta inlägg?",

app/javascript/mastodon/locales/th.json

@@ -123,11 +123,8 @@
   "block_modal.remote_users_caveat": "เราจะขอให้เซิร์ฟเวอร์ {domain} เคารพการตัดสินใจของคุณ อย่างไรก็ตาม ไม่รับประกันการปฏิบัติตามข้อกำหนดเนื่องจากเซิร์ฟเวอร์บางแห่งอาจจัดการการปิดกั้นแตกต่างกัน โพสต์สาธารณะอาจยังคงปรากฏแก่ผู้ใช้ที่ไม่ได้เข้าสู่ระบบ",
   "block_modal.show_less": "แสดงน้อยลง",
   "block_modal.show_more": "แสดงเพิ่มเติม",
-  "block_modal.they_cant_mention": "เขาไม่สามารถกล่าวถึงหรือติดตามคุณ",
-  "block_modal.they_cant_see_posts": "เขาไม่สามารถเห็นโพสต์ของคุณและคุณจะไม่เห็นโพสต์ของเขา",
   "block_modal.they_will_know": "เขาสามารถเห็นว่ามีการปิดกั้นเขา",
   "block_modal.title": "ปิดกั้นผู้ใช้?",
-  "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "boost_modal.combo": "คุณสามารถกดปุ่ม {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "boost_modal.reblog": "ดันโพสต์?",
   "boost_modal.undo_reblog": "เลิกดันโพสต์?",

app/javascript/mastodon/locales/tok.json

@@ -114,11 +114,8 @@
   "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso ma li ken kepeken nasin ante la pakala li ken. jan li awen ken lukin e toki kepeken sijelo ala.",
   "block_modal.show_less": "o lili e toki",
   "block_modal.show_more": "o suli e toki",
-  "block_modal.they_cant_mention": "ona li ken ala toki tawa sina li ken ala kute e sina.",
-  "block_modal.they_cant_see_posts": "ona li ken ala lukin e toki sina. sina ken ala lukin e toki ona.",
   "block_modal.they_will_know": "ona li ken sona e ni: sina len e ona.",
   "block_modal.title": "o len ala len e jan?",
-  "block_modal.you_wont_see_mentions": "jan li toki e nimi ona la sina lukin ala e toki ni.",
   "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
   "boost_modal.reblog": "o pana ala pana sin e toki?",
   "boost_modal.undo_reblog": "o weka ala weka e pana toki?",

app/javascript/mastodon/locales/tr.json

@@ -113,6 +113,7 @@
   "account.name.copy": "İsmi Kopyala",
   "account.name.help.domain": "{domain} kullanıcının profilini ve gönderilerini barındıran sunucudur.",
   "account.name.help.domain_self": "{domain} profilinizi ve gönderilerinizi barındıran sunucunuzdur.",
+  "account.name.help.footer": "Tıpkı farklı e-posta sağlayıcılarını kullanan kişilere e-posta gönderebileceğiniz gibi, diğer Mastodon sunucularındaki kullanıcılarla ve diğer Fediverse uygulamalarındaki herkesle etkileşim kurabilirsiniz.",
   "account.name.help.header": "Takma ad bir e-posta adresi gibidir",
   "account.name.help.username": "{username} bu hesabın sunucudaki kullanıcı adıdır. Başka bir sunucudaki başka bir kişi de aynı kullanıcı adına sahip olabilir.",
   "account.name.help.username_self": "{username} bu sunucudaki kullanıcı adınızdır. Başka bir sunucudaki başka bir kullanıcı da aynı kullanıcı adına sahip olabilir.",
@@ -325,11 +326,8 @@
   "block_modal.remote_users_caveat": "{domain} sunucusundan kararınıza saygı duymasını isteyeceğiz. Ancak, Uymaları garanti değildir çünkü bazı sunucular engellemeyi farklı şekilde yapıyorlar. Herkese açık gönderiler giriş yapmamış kullanıcılara görüntülenmeye devam edebilir.",
   "block_modal.show_less": "Daha az göster",
   "block_modal.show_more": "Daha fazla göster",
-  "block_modal.they_cant_mention": "Size değinemez veya sizi takip edemezler.",
-  "block_modal.they_cant_see_posts": "Onlar sizin gönderilerinizi görmeye devam edebilir, ancak siz onlarınkini göremezsiniz.",
   "block_modal.they_will_know": "Engellendiklerini görebiliyorlar.",
   "block_modal.title": "Kullanıcıyı engelle?",
-  "block_modal.you_wont_see_mentions": "Onlara değinen gönderileri göremezsiniz.",
   "boost_modal.combo": "Bir daha ki sefere {combo} tuşuna basabilirsin",
   "boost_modal.reblog": "Gönderiyi yeniden paylaş?",
   "boost_modal.undo_reblog": "Gönderinin yeniden paylaşımını geri al?",

app/javascript/mastodon/locales/uk.json

@@ -163,11 +163,8 @@
   "block_modal.remote_users_caveat": "Ми попросимо сервер {domain} поважати ваше рішення. Однак дотримання вимог не гарантується, оскільки деякі сервери можуть обробляти блоки по-різному. Загальнодоступні дописи все ще можуть бути видимими для користувачів, які не увійшли в систему.",
   "block_modal.show_less": "Згорнути",
   "block_modal.show_more": "Розгорнути",
-  "block_modal.they_cant_mention": "Вони не можуть згадувати та стежити за вами.",
-  "block_modal.they_cant_see_posts": "Вони не можуть бачити ваших дописів, а ви бачитимете їхні.",
   "block_modal.they_will_know": "Вони можуть бачити, що вони заблоковані.",
   "block_modal.title": "Заблокувати користувача?",
-  "block_modal.you_wont_see_mentions": "Ви не бачитимете дописів, де їх згадано.",
   "boost_modal.combo": "Ви можете натиснути {combo}, щоби пропустити це наступного разу",
   "boost_modal.reblog": "Поширити допис?",
   "boost_modal.undo_reblog": "Скасувати поширення?",

app/javascript/mastodon/locales/vi.json

@@ -331,11 +331,8 @@
   "block_modal.remote_users_caveat": "Chúng tôi sẽ yêu cầu {domain} tôn trọng quyết định của bạn. Tuy nhiên, việc tuân thủ không được đảm bảo vì một số máy chủ có thể xử lý việc chặn theo cách khác nhau. Các tút công khai vẫn có thể hiển thị đối với người dùng chưa đăng nhập.",
   "block_modal.show_less": "Thu gọn",
   "block_modal.show_more": "Hiện thêm",
-  "block_modal.they_cant_mention": "Họ không thể theo dõi & nhắc đến bạn.",
-  "block_modal.they_cant_see_posts": "Cả hai không còn nhìn thấy tút của nhau.",
   "block_modal.they_will_know": "Họ sẽ biết đã bị bạn chặn.",
   "block_modal.title": "Chặn tài khoản này?",
-  "block_modal.you_wont_see_mentions": "Bạn không còn thấy tút có nhắc đến họ.",
   "boost_modal.combo": "Nhấn {combo} để bỏ qua bước này",
   "boost_modal.reblog": "Đăng lại?",
   "boost_modal.undo_reblog": "Bỏ đăng lại?",

app/javascript/mastodon/locales/zh-CN.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "在Mastodon上分享",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
+  "block_modal.no_collections": "你们双方都无法将对方加入收藏列表。若适用，你们将会自动从彼此现有的收藏列表中移除。",
   "block_modal.remote_users_caveat": "我们将要求站点 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些站点可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录用户可见。",
   "block_modal.show_less": "折叠",
   "block_modal.show_more": "显示更多",
-  "block_modal.they_cant_mention": "他们不能提及或关注你。",
+  "block_modal.they_cant_mention": "你将无法提及、关注、引用彼此。",
-  "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
+  "block_modal.they_cant_see_posts": "他们看不到你发布的内容，你也看不到他们的。",
   "block_modal.they_will_know": "对方将能看到自己被屏蔽。",
   "block_modal.title": "确定要屏蔽此用户？",
-  "block_modal.you_wont_see_mentions": "你将不会看到提及他们的嘟文。",
+  "block_modal.you_wont_see_mentions": "你将不会看到其他人提及对方的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "boost_modal.reblog": "是否要转嘟？",
   "boost_modal.undo_reblog": "是否要取消转嘟？",

app/javascript/mastodon/locales/zh-HK.json

@@ -175,11 +175,8 @@
   "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重你的決定。然而，由於部份伺服器可能以不同方式處理封鎖，因此無法保證一定會成功。公開帖文仍然有機會被未登入的使用者看見。",
   "block_modal.show_less": "顯示更少",
   "block_modal.show_more": "顯示更多",
-  "block_modal.they_cant_mention": "對方無法提及和追蹤你。",
-  "block_modal.they_cant_see_posts": "你們無法看到對方的帖文。",
   "block_modal.they_will_know": "對方會看到自己被封鎖。",
   "block_modal.title": "封鎖使用者？",
-  "block_modal.you_wont_see_mentions": "你將不會看到提及對方的帖文。",
   "boost_modal.combo": "你下次可以按 {combo} 來跳過",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
   "bundle_column_error.error.body": "無法提供請求的頁面。這可能是因為代碼出現錯誤或瀏覽器出現兼容問題。",

app/javascript/mastodon/locales/zh-TW.json

@@ -328,14 +328,15 @@
   "annual_report.summary.share_on_mastodon": "於 Mastodon 上分享",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
+  "block_modal.no_collections": "您們雙方都無法將對方加入收藏名單。如適用，您們將自動自彼此現有收藏名單中移除。",
   "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器皆會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看見您的公開嘟文。",
   "block_modal.show_less": "減少顯示",
   "block_modal.show_more": "顯示更多",
-  "block_modal.they_cant_mention": "他們無法提及或跟隨您。",
+  "block_modal.they_cant_mention": "您無法提及、跟隨、或引用彼此。",
   "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的嘟文。",
   "block_modal.they_will_know": "他們能見到他們已被封鎖。",
   "block_modal.title": "是否封鎖該使用者？",
-  "block_modal.you_wont_see_mentions": "您將不會見到提及他們的嘟文。",
+  "block_modal.you_wont_see_mentions": "您將不會見到其他人提及他們的嘟文。",
   "boost_modal.combo": "您下次可以按 {combo} 跳過",
   "boost_modal.reblog": "是否要轉嘟？",
   "boost_modal.undo_reblog": "是否要取消轉嘟？",

app/javascript/mastodon/store/typed_functions.ts

@@ -230,7 +230,7 @@ export function createDataLoadingThunk<
 ): ReturnType<typeof createAsyncThunk<Args, Returned>>;
 
 /**
- * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions.
+ * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fulfilled` and `rejected` actions.
  *
  * You can run a callback on the `onData` results to either dispatch side effects or modify the payload.
  *

app/lib/activitypub/activity/create.rb

@@ -47,6 +47,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @mentions             = []
     @tagged_objects       = []
     @unresolved_mentions  = []
+    @unresolved_collections = []
     @silenced_account_ids = []
     @params               = {}
     @quote                = nil
@@ -68,6 +69,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     resolve_thread(@status)
     resolve_unresolved_mentions(@status)
+    resolve_unresolved_collections(@status)
     fetch_replies(@status)
     fetch_and_verify_quote
     distribute
@@ -286,8 +288,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     # TODO: We probably want to resolve unknown objects and push them to an `@unresolved_tagged_objects` on failure
     collection = ActivityPub::TagManager.instance.uri_to_resource(tag['id'], Collection)
+    collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(tag['id'], request_id: @options[:request_id])
 
     @tagged_objects << TaggedObject.new(uri: ActivityPub::TagManager.instance.uri_for(collection), object: collection, ap_type: 'FeaturedCollection') if collection.present?
+  rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
+    @unresolved_collections << tag['id']
   end
 
   def process_attachments
@@ -378,6 +383,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
   end
 
+  def resolve_unresolved_collections(status)
+    @unresolved_collections.uniq.each do |uri|
+      TaggedCollectionResolveWorker.perform_in(rand(PROCESSING_DELAY), status.id, uri, { 'request_id' => @options[:request_id] })
+    end
+  end
+
   def fetch_replies(status)
     collection = @object['replies']
     return if collection.blank?

app/services/activitypub/process_status_update_service.rb

@@ -237,11 +237,22 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
   end
 
   def update_tagged_objects!
+    unresolved_tagged_objects = []
+
     current_tagged_objects = @raw_tagged_objects.filter_map do |tagged_object|
       url = tagged_object['id']
 
       # TODO: We probably want to resolve unknown objects at authoring time
-      ActivityPub::TagManager.instance.uri_to_resource(url, Collection)
+      collection = ActivityPub::TagManager.instance.uri_to_resource(url, Collection)
+      collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(url, request_id: @request_id)
+
+      collection
+    rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
+      # Since previous tagged objects are about already-known collections,
+      # they don't try to resolve again and won't fall into this case.
+      # In other words, this failure case is only for new collections and can safely be retried later
+      unresolved_tagged_objects << url
+      nil
     end
 
     # Any previously-unresolved URI would be resolved here
@@ -252,6 +263,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
     # Remove unused links
     @status.tagged_objects.where.not(uri: current_tagged_objects.map { |object| ActivityPub::TagManager.instance.uri_for(object) }).delete_all
+
+    # Queue unresolved collections for later
+    unresolved_tagged_objects.uniq.each do |uri|
+      TaggedCollectionResolveWorker.perform_in(rand(PROCESSING_DELAY), @status.id, uri, { 'request_id' => @request_id })
+    end
   end
 
   def update_mentions!

app/views/admin/roles/_form.html.haml

@@ -25,12 +25,12 @@
     = form.input :highlighted,
                  wrapper: :with_label
 
-  - if current_user.role.administrator? || current_user.role != form.object
+- if current_user.role.administrator? || current_user.role != form.object
-    .fields-group
+  .fields-group
-      = form.input :require_2fa,
+    = form.input :require_2fa,
-                   wrapper: :with_label
+                 wrapper: :with_label
 
-  %hr.spacer/
+%hr.spacer/
 
 - if Mastodon::Feature.collections_enabled?
 

app/workers/tagged_collection_resolve_worker.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+class TaggedCollectionResolveWorker
+  include Sidekiq::Worker
+  include ExponentialBackoff
+  include JsonLdHelper
+
+  sidekiq_options queue: 'pull', retry: 7
+
+  def perform(status_id, uri, options = {})
+    status = Status.find_by(id: status_id)
+    return if status.nil?
+
+    collection = ActivityPub::TagManager.instance.uri_to_resource(uri, Collection)
+    collection ||= ActivityPub::FetchRemoteFeaturedCollectionService.new.call(uri, request_id: options['request_id'])
+    return if collection.nil?
+
+    status.tagged_objects.upsert({ ap_type: 'FeaturedCollection', object_id: collection.id, object_type: 'Collection' }, unique_by: %w(status_id object_type object_id))
+  rescue Mastodon::UnexpectedResponseError => e
+    response = e.response
+
+    raise(e) unless response_error_unsalvageable?(response)
+  end
+end

config/locales/be.yml

@@ -824,7 +824,6 @@ be:
         manage_custom_emojis: Кіраванне адвольнымі эмодзі
         manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы
         manage_email_subscriptions: Наладзіць падпіскі па электроннай пошце
-        manage_email_subscriptions_description: Дазвольце карыстальнікам падпісвацца на карыстальнікаў з гэтым дазволам праз электронную пошту
         manage_federation: Кіраваць федэрацыяй
         manage_federation_description: Дазваляе карыстальнікам блакіраваць або дазваляць аб'яднанне з іншымі даменамі і кантраляваць магчымасць дастаўкі
         manage_invites: Кіраванне запрашэннямі

config/locales/cy.yml

@@ -527,6 +527,71 @@ cy:
       resolved_dns_records_hint_html: Mae'r enw parth yn cyd-fynd â'r parthau MX canlynol, sy'n gyfrifol yn y pen draw am dderbyn e-bost. Bydd rhwystro parth MX yn rhwystro cofrestriadau o unrhyw gyfeiriad e-bost sy'n defnyddio'r un parth MX, hyd yn oed os yw'r enw parth gweladwy yn wahanol. <strong>Byddwch yn ofalus i beidio â rhwystro'r prif ddarparwyr e-bost.</strong>
       resolved_through_html: Wedi'i ddatrys trwy %{domain}
       title: Parthau e-bost wedi'u rhwystro
+    email_subscriptions:
+      accounts:
+        account: Cyfrif
+        active: Gweithredol
+        empty:
+          hint: Does gan unrhyw gyfrifon ddim tanysgrifwyr eto.
+          no_lists_yet: Dim rhestrau eto
+        inactive: Anweithredol
+        last_email: E-bost diwethaf
+        lead: Bydd cyfrifon sydd wedi galluogi'r nodwedd ac sydd â thanysgrifwyr yn ymddangos isod.
+        status: Statws
+        subscribers: Tanysgrifwyr
+        title: Rhestrau postio
+      additional_footer_texts:
+        show:
+          title: Testun troedyn ychwanegol
+      compliance_settings:
+        additional_footer_text:
+          action: Rheoli
+          hint: Testun dewisol sy'n ymddangos yn nhroedyn e-byst cylchlythyr yn unig
+          title: Testun troedyn ychwanegol
+        lead: Mae modd ystyried cylchlythyrau e-bost yn negeseuon e-bost marchnata, yn dibynnu ar yr awdurdodaethau lle rydych chi'n gweithredu.
+        privacy_policy:
+          action: Rheoli
+          hint: Mae dolen i'r polisi hwn yn nhroedyn pob e-bost
+          title: Polisi preifatrwydd
+        title: Gosodiadau cydymffurfio
+      danger_zone:
+        disable_feature:
+          action: Analluogi
+          hint: Diffoddwch y nodwedd ar gyfer pob cyfrif
+          title: Analluogi nodwedd
+        erase_all_data:
+          action: Dileu data
+          hint: Yn dileu pob e-bost ym mhob rhestr bostio yn barhaol
+          title: Dileu'r holl ddata
+        title: Parth perygl
+      disabled_msg: Mae tanysgrifiadau e-bost wedi cael eu hanalluogi'n llwyddiannus.
+      index:
+        disabled:
+          cannot_be_enabled: Dyw eich darparwr technegol ddim wedi galluogi'r nodwedd hon ar gyfer eich gweinydd.
+          description: Mae'r nodwedd hon yn caniatáu i gyfrifon penodol ychwanegu teclyn at eu proffiliau, gan alluogi ymwelwyr heb gyfrif Mastodon i dderbyn eu postiadau drwy e-bost.
+          get_started: Cychwyn arni
+        lead: Caniatáu i ymwelwyr dderbyn postiadau drwy e-bost o gyfrifon pwrpasol ar y gweinydd hwn.
+        title: Cylchlythyrau e-bost
+      purged_msg: Mae holl ddata tanysgrifiadau e-bost yn cael ei ddileu.
+      roles:
+        accounts: Cyfrifon
+        edit_role: Golygu rôl
+        empty:
+          hint: Does gan neb ganiatâd i ddefnyddio'r nodwedd hon.
+          no_roles_added: Dim rolau wedi'u hychwanegu
+        lead: Gall cyfrifon gyda'r rolau canlynol alluogi'r nodwedd hon ar eu proffiliau.
+        manage_roles: Rheoli rolau
+        role_name: Enw'r rôl
+        title: Rolau
+      setups:
+        show:
+          enable_feature: Galluogi nodwedd
+          important_information: Gwybodaeth bwysig
+          list:
+            1_permission_explanation: Pan fydd y nodwedd hon wedi'i galluogi, gall cyfrifon sydd â'r caniatâd dynodedig ychwanegu ffurflen casglu e-byst at eu proffiliau.
+            2_feature_explanation: Pan fydd ymwelwyr yn cofrestru ar dudalen proffil cyfrif ac yn cadarnhau eu tanysgrifiad, byddan yn dechrau derbyn diweddariadau e-bost pan fydd y cyfrif yn creu postiadau cyhoeddus newydd.
+            3_privacy_policy_warning: Bydd gan weinyddwyr gweinydd fynediad at y cyfeiriadau e-bost (PII) sy'n cael eu casglu. O'r herwydd, rhaid diweddaru'r polisi preifatrwydd a'r Telerau Gwasanaeth ar gyfer y gweinydd cyn defnyddio'r nodwedd hon.
+            4_cost_warning: Gall e-byst olygu ffi yn dibynnu ar y drefn cynnal. Trafodwch â'ch darparwr cynnal cyn ei alluogi, gan y gallai'r nodwedd hon gynyddu nifer yr e-byst a anfonir o'ch gweinydd yn sylweddol.
     export_domain_allows:
       new:
         title: Mewnforio parth yn caniatáu
@@ -856,7 +921,7 @@ cy:
         manage_custom_emojis: Rheoli Emojis Cyfaddas
         manage_custom_emojis_description: Yn caniatáu i ddefnyddwyr reoli emojis cyfaddas ar y gweinydd
         manage_email_subscriptions: Rheoli Tanysgrifiadau E-bost
-        manage_email_subscriptions_description: Caniatáu i ddefnyddwyr danysgrifio i ddefnyddwyr sydd â'r caniatâd hwn drwy e-bost
+        manage_email_subscriptions_description: Caniatáu i ddefnyddwyr sydd â'r caniatâd hwn alluogi'r nodwedd cylchlythyr e-bost ar gyfer eu cyfrif
         manage_federation: Rheoli Ffederasiwn
         manage_federation_description: Yn caniatáu i ddefnyddwyr rwystro neu ganiatáu ffedereiddio â pharthau eraill, a rheoli'r gallu i gyflawni
         manage_invites: Rheoli Gwahoddiadau
@@ -1899,6 +1964,31 @@ cy:
     copy_account_note_text: 'Symudodd y defnyddiwr hwn o %{acct}, dyma oedd eich nodiadau blaenorol amdanynt:'
   navigation:
     toggle_menu: Toglo'r ddewislen
+  notification_fallbacks:
+    added_to_collection:
+      title_html: Ychwanegodd %{name} chi at gasgliad
+    admin_report:
+      title_html: Mae %{name} wedi adrodd ar %{target}
+    admin_sign_up:
+      title_and_others_html:
+        few: Mae %{name} a %{count} eraill wedi cofrestru
+        many: Mae %{name} a %{count} eraill wedi cofrestru
+        one: Mae %{name} ac un arall wedi cofrestru
+        other: Mae %{name} a %{count} eraill wedi cofrestru
+        two: Mae %{name} a %{count} eraill wedi cofrestru
+        zero: Mae %{name} a %{count} eraill wedi cofrestru
+      title_html: Mae %{name} wedi cofrestru
+    collection_update:
+      title_html: Mae %{name} wedi diweddaru casgliad rydych chi ynddo
+    generic:
+      sign_in: Mewngofnodwch i ap gwe Mastodon
+      summary_html: Rydych chi ar ap nad yw'n cefnogi'r fersiwn ddiweddaraf o Mastodon. %{link} am ymarferoldeb llawn.
+    moderation_warning:
+      summary_html: Rydych chi ar ap nad yw'n cefnogi'r fersiwn ddiweddaraf o Mastodon. %{link}.
+      title: Rydych chi wedi derbyn rhybudd cymedroli.
+    severed_relationships:
+      summary_html: Mae gweinyddwr o %{from} wedi atal %{target}, sy'n golygu nad ydych yn gallu derbyn diweddariadau ganddyn nhw na rhyngweithio â nhw bellach. Ewch i %{link} i adfer rhestr o'r perthnasoedd coll.
+      title: Colli cysylltiadau gyda %{name}
   notification_mailer:
     admin:
       report:

config/locales/da.yml

@@ -487,6 +487,71 @@ da:
       resolved_dns_records_hint_html: Domænenavnet opløses til flg. MX-domæner, som i sidste ende er ansvarlige for e-mailmodtagelse. Blokering af et MX-domæne blokerer også tilmeldinger fra enhver e-mailadresse på det pågældende MX-domæne, selv hvis det synlige domænenavn er et andet. <strong>Pas på ikke at blokere større e-mailudbydere.</strong>
       resolved_through_html: Opløst via %{domain}
       title: Blokerede e-maildomæner
+    email_subscriptions:
+      accounts:
+        account: Konto
+        active: Aktive
+        empty:
+          hint: Ingen konti har abonnenter endnu.
+          no_lists_yet: Ingen lister endnu
+        inactive: Inaktive
+        last_email: Seneste e-mail
+        lead: Nedenfor vises de konti, der har aktiveret funktionen og har abonnenter.
+        status: Status
+        subscribers: Abonnenter
+        title: Mailinglister
+      additional_footer_texts:
+        show:
+          title: Yderligere tekst til sidefod
+      compliance_settings:
+        additional_footer_text:
+          action: Administrér
+          hint: Valgfri tekst, der kun vises i sidefoden på e-mail-nyhedsbreve
+          title: Yderligere tekst til sidefod
+        lead: E-mail-nyhedsbreve kan blive betragtet som markedsføringsmails afhængigt af de jurisdiktioner, hvor du opererer.
+        privacy_policy:
+          action: Administrér
+          hint: Denne politik er linket til i bunden af hver e-mail
+          title: Privatlivspolitik
+        title: Compliance-indstillinger
+      danger_zone:
+        disable_feature:
+          action: Deaktivér
+          hint: Slå funktionen fra for alle konti
+          title: Deaktivér funktion
+        erase_all_data:
+          action: Slet data
+          hint: Sletter alle e-mails i alle mailinglister permanent
+          title: Slet alle data
+        title: Farezone
+      disabled_msg: E-mail-abonnementer er blevet deaktiveret.
+      index:
+        disabled:
+          cannot_be_enabled: Din tekniske udbyder har ikke aktiveret denne funktion på din server.
+          description: Denne funktion giver angivne konti mulighed for at tilføje en widget til deres profiler, så besøgende uden en Mastodon-konto kan modtage deres indlæg via e-mail.
+          get_started: Kom i gang
+        lead: Tillad besøgende at modtage indlæg via e-mail fra dedikerede konti på denne server.
+        title: Nyhedsbreve via e-mail
+      purged_msg: Alle data vedrørende e-mail-abonnementer slettes.
+      roles:
+        accounts: Konti
+        edit_role: Rediger rolle
+        empty:
+          hint: Ingen har tilladelse til at bruge denne funktion.
+          no_roles_added: Ingen roller tilføjet
+        lead: Brugere med følgende roller kan aktivere denne funktion på deres profiler.
+        manage_roles: Administrer roller
+        role_name: Rollenavn
+        title: Roller
+      setups:
+        show:
+          enable_feature: Aktivér funktion
+          important_information: Vigtig information
+          list:
+            1_permission_explanation: Når denne funktion er aktiveret, kan brugere med de angivne rettigheder tilføje en formular til indsamling af e-mailadresser til deres profiler.
+            2_feature_explanation: Når besøgende tilmelder sig på en kontos profilside og bekræfter deres abonnement, vil de begynde at modtage e-mail-opdateringer, når kontoen opretter nye offentlige indlæg.
+            3_privacy_policy_warning: Serveradministratorer vil have adgang til de indsamlede personoplysninger (e-mailadresser). Derfor skal serverens privatlivspolitik og servicevilkår opdateres, inden denne funktion tages i brug.
+            4_cost_warning: Der kan påløbe et gebyr for e-mails afhængigt af hostingopsætningen. Tal med din hostingudbyder, inden du aktiverer funktionen, da den kan medføre en markant stigning i antallet af e-mails, der sendes fra din server.
     export_domain_allows:
       new:
         title: Importeret domæne tillader
@@ -792,7 +857,7 @@ da:
         manage_custom_emojis: Administrere tilpassede emojier
         manage_custom_emojis_description: Tillader brugere at administrere tilpassede emojier på serveren
         manage_email_subscriptions: Administrer e-mail-abonnementer
-        manage_email_subscriptions_description: Giv brugere mulighed for at abonnere på andre brugere med denne tilladelse via e-mail
+        manage_email_subscriptions_description: Giv brugere med denne tilladelse mulighed for at aktivere funktionen til e-mail-nyhedsbreve på deres konto
         manage_federation: Administrere federation
         manage_federation_description: Tillader brugere at blokere eller tillade federation med andre domæner og styre leverbarhed
         manage_invites: Administrere invitationer

config/locales/de.yml

@@ -487,6 +487,45 @@ de:
       resolved_dns_records_hint_html: Die Domain wird zu den folgenden MX-Domains aufgelöst, die für die Annahme von E-Mails zuständig sind. Das Sperren einer MX-Domain sperrt Anmeldungen aller E-Mail-Adressen, die dieselbe MX-Domain verwenden, auch wenn die sichtbare Domain anders lautet. <strong>Achte daher darauf, keine großen E-Mail-Anbieter versehentlich zu sperren.</strong>
       resolved_through_html: Durch %{domain} aufgelöst
       title: Gesperrte E-Mail-Domains
+    email_subscriptions:
+      accounts:
+        account: Konto
+        active: Aktiviert
+        empty:
+          hint: Bisher wurden keine Konten abonniert.
+          no_lists_yet: Noch keine Listen vorhanden
+        inactive: Deaktiviert
+        lead: Konten, die die Funktion aktiviert haben und abonniert wurden, werden unten angezeigt.
+        status: Status
+        subscribers: Abonnent*innen
+        title: Mailingliste
+      compliance_settings:
+        additional_footer_text:
+          action: Verwalten
+        privacy_policy:
+          action: Verwalten
+          title: Datenschutzerklärung
+      danger_zone:
+        disable_feature:
+          action: Deaktivieren
+          title: Funktion deaktivieren
+        erase_all_data:
+          action: Daten löschen
+          title: Alle Daten löschen
+        title: Gefahrenzone
+      index:
+        disabled:
+          get_started: Loslegen
+      roles:
+        accounts: Konten
+        edit_role: Rolle bearbeiten
+        manage_roles: Rollen verwalten
+        role_name: Name der Rolle
+        title: Rollen
+      setups:
+        show:
+          enable_feature: Funktionen aktivieren
+          important_information: Wichtige Informationen
     export_domain_allows:
       new:
         title: Erlaubte Domains importieren
@@ -792,7 +831,6 @@ de:
         manage_custom_emojis: Emojis
         manage_custom_emojis_description: Spezielle Emojis dieses Servers verwalten
         manage_email_subscriptions: E-Mail-Abonnements
-        manage_email_subscriptions_description: Profile können per E-Mail-Benachrichtigung abonniert werden
         manage_federation: Föderation
         manage_federation_description: Domains anderer Mastodon-Server sperren/zulassen – und Zustellbarkeit kontrollieren
         manage_invites: Einladungen

config/locales/el.yml

@@ -487,6 +487,71 @@ el:
       resolved_dns_records_hint_html: Το όνομα τομέα επιλύεται στους ακόλουθους τομείς MX, οι οποίοι είναι τελικά υπεύθυνοι για την αποδοχή των email. Αποκλείοντας έναν τομέα MX θα αποκλείει τις εγγραφές από οποιαδήποτε διεύθυνση email που χρησιμοποιεί τον ίδιο τομέα MX, ακόμη και αν το ορατό όνομα τομέα είναι διαφορετικό. <strong>Προσέξτε να μην αποκλείσετε τους μεγάλους παρόχους ηλεκτρονικού ταχυδρομείου.</strong>
       resolved_through_html: Επιλύθηκε μέσω %{domain}
       title: Αποκλεισμένοι τομείς email
+    email_subscriptions:
+      accounts:
+        account: Λογαριασμός
+        active: Ενεργός
+        empty:
+          hint: Κανένας λογαριασμός δεν έχει συνδρομητές ακόμη.
+          no_lists_yet: Καμία λίστα ακόμη
+        inactive: Ανενεργός
+        last_email: Τελευταίο email
+        lead: Λογαριασμοί που έχουν ενεργοποιήσει τη λειτουργία και έχουν συνδρομητές θα εμφανίζονται παρακάτω.
+        status: Κατάσταση
+        subscribers: Συνδρομητές
+        title: Λίστες αλληλογραφίας
+      additional_footer_texts:
+        show:
+          title: Πρόσθετο κείμενο υποσέλιδου
+      compliance_settings:
+        additional_footer_text:
+          action: Διαχείριση
+          hint: Προαιρετικό κείμενο που εμφανίζεται στο υποσέλιδο των email ενημερωτικού δελτίου μόνο
+          title: Πρόσθετο κείμενο υποσέλιδου
+        lead: Τα email ενημερωτικού δελτίου μπορεί να θεωρηθούν διαφημιστικά μηνύματα, ανάλογα με τις δικαιοδοσίες όπου λειτουργείτε.
+        privacy_policy:
+          action: Διαχείριση
+          hint: Αυτή η πολιτική συνδέεται στο υποσέλιδο κάθε email
+          title: Πολιτική απορρήτου
+        title: Ρυθμίσεις συμμόρφωσης
+      danger_zone:
+        disable_feature:
+          action: Απενεργοποίηση
+          hint: Απενεργοποιήστε τη λειτουργία για όλους τους λογαριασμούς
+          title: Απενεργοποίηση λειτουργίας
+        erase_all_data:
+          action: Διαγραφή δεδομένων
+          hint: Θα διαγράψει μόνιμα όλα τα email σε όλες τις λίστες αλληλογραφίας
+          title: Διαγραφή όλων των δεδομένων
+        title: Επικίνδυνη ζώνη
+      disabled_msg: Οι συνδρομές email έχουν απενεργοποιηθεί επιτυχώς.
+      index:
+        disabled:
+          cannot_be_enabled: Ο τεχνικός σας πάροχος δεν έχει ενεργοποιήσει αυτήν τη λειτουργία για τον διακομιστή σας.
+          description: Αυτή η λειτουργία επιτρέπει σε συγκεκριμένους λογαριασμούς να προσθέσουν ένα γραφικό στοιχείο στο προφίλ τους, επιτρέποντας στους επισκέπτες χωρίς λογαριασμό Mastodon να λαμβάνουν τις αναρτήσεις τους μέσω email.
+          get_started: Ξεκινήστε
+        lead: Να επιτρέπεται στους επισκέπτες να λαμβάνουν αναρτήσεις μέσω email από αποκλειστικούς λογαριασμούς σε αυτόν τον διακομιστή.
+        title: Ενημερωτικά δελτία email
+      purged_msg: Όλα τα δεδομένα συνδρομής email διαγράφονται.
+      roles:
+        accounts: Λογαριασμοί
+        edit_role: Επεξεργασία ρόλου
+        empty:
+          hint: Κανένας δεν έχει δικαίωμα να χρησιμοποιήσει αυτήν τη λειτουργία.
+          no_roles_added: Δεν προστέθηκαν ρόλοι
+        lead: Λογαριασμοί με τους ακόλουθους ρόλους μπορούν να ενεργοποιήσουν αυτήν τη λειτουργία στο προφίλ τους.
+        manage_roles: Διαχείριση ρόλων
+        role_name: Όνομα ρόλου
+        title: Ρόλοι
+      setups:
+        show:
+          enable_feature: Ενεργοποίηση λειτουργίας
+          important_information: Σημαντικές πληροφορίες
+          list:
+            1_permission_explanation: Όταν αυτή η λειτουργία είναι ενεργοποιημένη, οι λογαριασμοί με τα καθορισμένα δικαιώματα μπορούν να προσθέσουν μια φόρμα συλλογής email στα προφίλ τους.
+            2_feature_explanation: Όταν οι επισκέπτες εγγράφονται στη σελίδα προφίλ ενός λογαριασμού και επιβεβαιώνουν τη συνδρομή τους, θα αρχίσουν να λαμβάνουν ενημερωτικά email όταν ο λογαριασμός δημιουργεί νέες δημόσιες αναρτήσεις.
+            3_privacy_policy_warning: Οι διαχειριστές του διακομιστή θα έχουν πρόσβαση σε PII (διευθύνσεις email) που συλλέχθηκαν. Ως εκ τούτου, η Πολιτική απορρήτου και οι Όροι υπηρεσίας για τον διακομιστή πρέπει να ενημερωθούν πριν από τη χρήση αυτής της λειτουργίας.
+            4_cost_warning: Τα μηνύματα email μπορούν να επιβαρύνονται με κόστος ανάλογα με τη ρύθμιση φιλοξενίας. Συζητήστε με τον πάροχο φιλοξενίας σας πριν την ενεργοποιήσετε, καθώς αυτή η λειτουργία θα μπορούσε να αυξήσει δραστικά το ποσό των μηνυμάτων email που αποστέλλονται από τον διακομιστή σας.
     export_domain_allows:
       new:
         title: Εισαγωγή επιτρεπόμενων τομέων
@@ -792,7 +857,7 @@ el:
         manage_custom_emojis: Διαχείριση Προσαρμοσμένων Emojis
         manage_custom_emojis_description: Επιτρέπει στους χρήστες να διαχειρίζονται προσαρμοσμένα emojis στον διακομιστή
         manage_email_subscriptions: Διαχείριση Συνδρομών Email
-        manage_email_subscriptions_description: Να επιτρέπεται στους χρήστες να εγγράφονται σε χρήστες με αυτήν την άδεια μέσω ηλεκτρονικού ταχυδρομείου
+        manage_email_subscriptions_description: Να επιτρέπεται στους χρήστες με αυτό το δικαίωμα να ενεργοποιούν τη λειτουργία email ενημερωτικού δελτίου για το λογαριασμό τους
         manage_federation: Διαχείριση Ομοσπονδίας
         manage_federation_description: Επιτρέπει στους χρήστες να αποκλείουν ή να επιτρέπουν τις συναλλαγές με άλλους τομείς και να ελέγχουν την παράδοση
         manage_invites: Διαχείριση Προσκλήσεων

config/locales/en-GB.yml

@@ -792,7 +792,6 @@ en-GB:
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
         manage_email_subscriptions: Manage Email Subscriptions
-        manage_email_subscriptions_description: Allow users to subscribe to users with this permission by email
         manage_federation: Manage Federation
         manage_federation_description: Allows users to block or allow federation with other domains, and control deliverability
         manage_invites: Manage Invites

config/locales/es-AR.yml

@@ -487,6 +487,71 @@ es-AR:
       resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Tené cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
       title: Dominios bloqueados de correo electrónico
+    email_subscriptions:
+      accounts:
+        account: Cuenta
+        active: Activa
+        empty:
+          hint: Aún no hay cuentas con suscriptores.
+          no_lists_yet: Aún no hay listas
+        inactive: Inactiva
+        last_email: Último correo electrónico
+        lead: Las cuentas que habilitaron la función y tienen suscriptores se mostrarán a continuación.
+        status: Estado
+        subscribers: Suscriptores
+        title: Listas de correo
+      additional_footer_texts:
+        show:
+          title: Texto de pie de página adicional
+      compliance_settings:
+        additional_footer_text:
+          action: Administrar
+          hint: Texto opcional que aparece solo en el pie de los correos electrónicos del boletín de noticias
+          title: Texto de pie de página adicional
+        lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operás.
+        privacy_policy:
+          action: Administrar
+          hint: Esta política está vinculada en el pie de cada correo electrónico
+          title: Política de privacidad
+        title: Configuración de cumplimiento
+      danger_zone:
+        disable_feature:
+          action: Deshabilitar
+          hint: Deshabilitar función para todas las cuentas
+          title: Deshabilitar función
+        erase_all_data:
+          action: Eliminar datos
+          hint: Eliminar permanentemente todos los correos electrónicos de todas las listas de correo
+          title: Eliminar todos los datos
+        title: Zona de peligro
+      disabled_msg: Las suscripciones de correo electrónico se deshabilitaron correctamente.
+      index:
+        disabled:
+          cannot_be_enabled: Tu proveedor técnico no habilitó esta función para tu servidor.
+          description: Esta función permite a las cuentas especificadas agregar un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus mensajes por correo electrónico.
+          get_started: Primeros pasos
+        lead: Permitir a los visitantes recibir mensajes por correo electrónico de cuentas dedicadas en este servidor.
+        title: Boletines de noticias
+      purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo eliminados.
+      roles:
+        accounts: Cuentas
+        edit_role: Editar rol
+        empty:
+          hint: Nadie tiene permiso para usar esta función.
+          no_roles_added: No hay roles agregados
+        lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles.
+        manage_roles: Administrar roles
+        role_name: Nombre del rol
+        title: Roles
+      setups:
+        show:
+          enable_feature: Habilitar función
+          important_information: Información importante
+          list:
+            1_permission_explanation: Cuando esta función está habilitada, las cuentas con los permisos designados pueden agregar un formulario de recopilación de correo electrónico a sus perfiles.
+            2_feature_explanation: Cuando los visitantes se registren en la página de perfil de una cuenta y confirmen su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevos mensajes públicos.
+            3_privacy_policy_warning: Los administradores del servidor tendrán acceso a PII (direcciones de correo electrónico). Como tal, la política de privacidad y los términos de servicio para el servidor deben ser actualizados antes de usar esta función.
+            4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Hable con su proveedor de alojamiento antes de habilitar esta función, ya que la misma podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor.
     export_domain_allows:
       new:
         title: Importar permisos de dominio
@@ -792,7 +857,7 @@ es-AR:
         manage_custom_emojis: Administrar emojis personalizados
         manage_custom_emojis_description: Permite a los usuarios administrar emojis personalizados en el servidor
         manage_email_subscriptions: Administrar suscripciones de correo electrónico
-        manage_email_subscriptions_description: Permitir a los usuarios suscribirse a usuarios con este permiso por correo electrónico
+        manage_email_subscriptions_description: Permitir a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para sus cuentas
         manage_federation: Administrar Federación
         manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios y controlar las entregas
         manage_invites: Administrar invitaciones

config/locales/es-MX.yml

@@ -487,6 +487,71 @@ es-MX:
       resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Ten cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
       title: Dominios de correo bloqueados
+    email_subscriptions:
+      accounts:
+        account: Cuenta
+        active: Activa
+        empty:
+          hint: Ninguna cuenta tiene suscriptores todavía.
+          no_lists_yet: No hay listas todavía
+        inactive: Inactiva
+        last_email: Último correo electrónico
+        lead: Las cuentas que han habilitado la función y tienen suscriptores se mostrarán a continuación.
+        status: Estado
+        subscribers: Suscriptores
+        title: Listas de correo
+      additional_footer_texts:
+        show:
+          title: Texto de pie de página adicional
+      compliance_settings:
+        additional_footer_text:
+          action: Administrar
+          hint: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de noticias
+          title: Texto de pie de página adicional
+        lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operas.
+        privacy_policy:
+          action: Administrar
+          hint: Esta política está enlazada en el pie de cada correo electrónico
+          title: Política de privacidad
+        title: Ajustes de cumplimiento normativo
+      danger_zone:
+        disable_feature:
+          action: Desactivar
+          hint: Desactivar función para todas las cuentas
+          title: Desactivar función
+        erase_all_data:
+          action: Borrar datos
+          hint: Borra permanentemente todos los correos electrónicos de todas las listas de correo
+          title: Borrar todos los datos
+        title: Zona peligrosa
+      disabled_msg: Las suscripciones de correo electrónico se han desactivado correctamente.
+      index:
+        disabled:
+          cannot_be_enabled: Tu proveedor técnico no ha habilitado esta función para tu servidor.
+          description: Esta función permite a las cuentas especificadas añadir un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus publicaciones por correo electrónico.
+          get_started: Primeros pasos
+        lead: Permitir a los visitantes recibir publicaciones por correo electrónico de cuentas dedicadas en este servidor.
+        title: Boletines de correo electrónico
+      purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo borrados.
+      roles:
+        accounts: Cuentas
+        edit_role: Editar rol
+        empty:
+          hint: Nadie tiene permiso para usar esta función.
+          no_roles_added: No se han añadido roles
+        lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles.
+        manage_roles: Administrar roles
+        role_name: Nombre del rol
+        title: Roles
+      setups:
+        show:
+          enable_feature: Activar función
+          important_information: Información importante
+          list:
+            1_permission_explanation: Cuando esta función está activada, las cuentas con los permisos designados pueden añadir un formulario de recopilación de correo electrónico a sus perfiles.
+            2_feature_explanation: Cuando los visitantes se registran en la página de perfil de una cuenta y confirman su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevas publicaciones públicas.
+            3_privacy_policy_warning: Los administradores del servidor tendrán acceso a información de identificación personal (direcciones de correo electrónico). Por lo tanto, la política de privacidad y los Términos del Servicio del servidor deben actualizarse antes de usar esta función.
+            4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Habla con tu proveedor de alojamiento antes de activarlo, ya que esta característica podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor.
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -792,7 +857,7 @@ es-MX:
         manage_custom_emojis: Administrar Emojis Personalizados
         manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
         manage_email_subscriptions: Gestionar suscripciones por correo electrónico
-        manage_email_subscriptions_description: Permitir a los usuarios suscribirse a otros usuarios con este permiso por correo electrónico
+        manage_email_subscriptions_description: Permite a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para su cuenta
         manage_federation: Administrar Federación
         manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad
         manage_invites: Administrar Invitaciones

config/locales/es.yml

@@ -487,6 +487,71 @@ es:
       resolved_dns_records_hint_html: El nombre de dominio resuelve los siguientes dominios MX, los cuales son responsables en última instancia de aceptar el correo electrónico. Bloquear un dominio MX bloqueará los registros de cualquier dirección de correo electrónico que utilice el mismo dominio MX, incluso si el nombre de dominio visible es diferente. <strong>Ten cuidado de no bloquear los principales proveedores de correo electrónico.</strong>
       resolved_through_html: Resuelto a través de %{domain}
       title: Dominios de correo bloqueados
+    email_subscriptions:
+      accounts:
+        account: Cuenta
+        active: Activa
+        empty:
+          hint: Aún no hay cuentas con suscriptores.
+          no_lists_yet: Aún no hay listas
+        inactive: Inactiva
+        last_email: Último correo electrónico
+        lead: Las cuentas que han habilitado la función y tienen suscriptores se mostrarán a continuación.
+        status: Estado
+        subscribers: Suscriptores
+        title: Listas de correo
+      additional_footer_texts:
+        show:
+          title: Texto de pie de página adicional
+      compliance_settings:
+        additional_footer_text:
+          action: Administrar
+          hint: Texto opcional que aparece únicamente en el pie de los correos electrónicos del boletín de noticias
+          title: Texto de pie de página adicional
+        lead: Los boletines de correo electrónico pueden considerarse correos electrónicos de marketing, dependiendo de las jurisdicciones en las que operas.
+        privacy_policy:
+          action: Administrar
+          hint: Esta política está enlazada en el pie de cada correo electrónico
+          title: Política de privacidad
+        title: Ajustes de cumplimiento normativo
+      danger_zone:
+        disable_feature:
+          action: Desactivar
+          hint: Desactivar función para todas las cuentas
+          title: Desactivar función
+        erase_all_data:
+          action: Borrar datos
+          hint: Borra permanentemente todos los correos electrónicos de todas las listas de correo
+          title: Borrar todos los datos
+        title: Zona peligrosa
+      disabled_msg: Las suscripciones de correo electrónico se han desactivado correctamente.
+      index:
+        disabled:
+          cannot_be_enabled: Tu proveedor técnico no ha habilitado esta función para tu servidor.
+          description: Esta función permite a las cuentas especificadas añadir un widget a sus perfiles, permitiendo a los visitantes sin una cuenta de Mastodon recibir sus publicaciones por correo electrónico.
+          get_started: Primeros pasos
+        lead: Permitir a los visitantes recibir publicaciones por correo electrónico de cuentas dedicadas en este servidor.
+        title: Boletines de correo electrónico
+      purged_msg: Todos los datos de las suscripciones de correo electrónico están siendo borrados.
+      roles:
+        accounts: Cuentas
+        edit_role: Editar rol
+        empty:
+          hint: Nadie tiene permiso para usar esta función.
+          no_roles_added: No se han añadido roles
+        lead: Las cuentas con los siguientes roles pueden habilitar esta función en sus perfiles.
+        manage_roles: Administrar roles
+        role_name: Nombre del rol
+        title: Roles
+      setups:
+        show:
+          enable_feature: Activar función
+          important_information: Información importante
+          list:
+            1_permission_explanation: Cuando esta función está activada, las cuentas con los permisos designados pueden añadir un formulario de recopilación de correo electrónico a sus perfiles.
+            2_feature_explanation: Cuando los visitantes se registran en la página de perfil de una cuenta y confirman su suscripción, comenzarán a recibir actualizaciones por correo electrónico cuando la cuenta cree nuevas publicaciones públicas.
+            3_privacy_policy_warning: Los administradores del servidor tendrán acceso a información de identificación personal (direcciones de correo electrónico). Por lo tanto, la política de privacidad y los Términos del Servicio del servidor deben actualizarse antes de usar esta función.
+            4_cost_warning: Los correos electrónicos pueden incurrir en un cargo dependiendo de la configuración del alojamiento. Habla con tu proveedor de alojamiento antes de activarlo, ya que esta característica podría aumentar drásticamente la cantidad de correos electrónicos enviados desde tu servidor.
     export_domain_allows:
       new:
         title: Importar dominios permitidos
@@ -792,7 +857,7 @@ es:
         manage_custom_emojis: Administrar Emojis Personalizados
         manage_custom_emojis_description: Permite a los usuarios gestionar emojis personalizados en el servidor
         manage_email_subscriptions: Administrar suscripciones de correo electrónico
-        manage_email_subscriptions_description: Permitir a los usuarios suscribirse a usuarios con este permiso por correo electrónico
+        manage_email_subscriptions_description: Permite a los usuarios con este permiso habilitar la función del boletín de noticias por correo electrónico para su cuenta
         manage_federation: Administrar Federación
         manage_federation_description: Permite a los usuarios bloquear o permitir la federación con otros dominios, y controlar la entregabilidad
         manage_invites: Administrar Invitaciones

config/locales/et.yml

@@ -487,6 +487,58 @@ et:
       resolved_dns_records_hint_html: Domeeninimi lahendatakse järgmistele MX-domeenidele, mis on lõppkokkuvõttes vastutavad e-kirjade vastuvõtmise eest. MX-domeeni blokeerimine blokeerib registreerimise mis tahes e-posti aadressilt, mis kasutab sama MX-domeeni, isegi kui nähtav domeeninimi on erinev. <strong>Ole ettevaatlik, et mitte blokeerida peamisi e-posti teenusepakkujaid.</strong>
       resolved_through_html: Lahendatud %{domain} kaudu
       title: Blokeeritud e-posti domeenid
+    email_subscriptions:
+      accounts:
+        account: Konto
+        active: Aktiivne
+        empty:
+          hint: Ühelgi kontol pole veel tellijaid.
+          no_lists_yet: Veel pole loetelusid
+        inactive: Mitteaktiivne
+        last_email: Viimane e-post
+        lead: Allpool kuvatakse kontod, kus see funktsioon on aktiveeritud ja millel on tellijaid.
+        status: Olek
+        subscribers: Tellijad
+        title: Meililistid
+      additional_footer_texts:
+        show:
+          title: Täiendav jaluse tekst
+      compliance_settings:
+        additional_footer_text:
+          action: Halda
+          hint: Valikuline tekst, mida kuvatakse ainult uudis-e-kirjade jaluses
+          title: Täiendav jaluse tekst
+        lead: E-posti uudiskirju võidakse käsitleda turundusmeilidena, sõltuvalt sellest, millises jurisdiktsioonis tegutsetakse.
+        privacy_policy:
+          action: Haldamine
+          hint: Need reeglid lingitakse iga e-kirja jalusesse
+          title: Privaatsusreeglid
+        title: Vastavuse seaded
+      danger_zone:
+        disable_feature:
+          action: Keela
+          hint: Lülita funktsioon kõikidel kontodel välja
+          title: Keela funktsioon
+        erase_all_data:
+          action: Kustuta andmed
+          hint: Kustutab kõigist meililistidest kõik e-kirjad lõplikult
+          title: Kustuta kõik andmed
+        title: Ohtlik ala
+      disabled_msg: E-kirja teavituste tellimine on edukalt keelatud.
+      index:
+        disabled:
+          cannot_be_enabled: Tehniline teenusepakkuja ei ole seda funktsiooni sinu serveris aktiveerinud.
+          description: See funktsioon võimaldab määratud kontodel lisada oma profiilile vidina, mis võimaldab külastajatel, kellel pole Mastodoni kontot, saada kontode postitusi e-posti teel.
+          get_started: Alustamine
+        lead: Võimalda külastajatel saada selle serveri määratud kontodelt postitusi e-posti teel.
+        title: E-posti uudiskirjad
+      purged_msg: Kõik e-posti tellimuste andmed kustutatakse.
+      roles:
+        accounts: Kontod
+        edit_role: Muuda rolli
+        empty:
+          hint: Kellelgi pole õigust seda oskust kasutada.
+          no_roles_added: Rolle pole lisatud
     export_domain_allows:
       new:
         title: Lubatud domeenide import
@@ -792,7 +844,6 @@ et:
         manage_custom_emojis: Halda isetehtud emotikone
         manage_custom_emojis_description: Lubab kasutajatel hallata serveris isetehtud emotikone
         manage_email_subscriptions: Halda e-posti tellimusi
-        manage_email_subscriptions_description: Luba selle õigusega kasutajatel tellida kasutajaid e-posti teel
         manage_federation: Halda födereerumist
         manage_federation_description: Lubab kasutajail keelata või lubada föderatsioone teiste domeenidega ja hallata ühenduvust
         manage_invites: Halda kutseid

config/locales/fi.yml

@@ -487,6 +487,44 @@ fi:
       resolved_dns_records_hint_html: Verkkotunnusnimi kytkeytyy seuraaviin MX-verkkotunnuksiin, jotka ovat viime kädessä vastuussa sähköpostin vastaanottamisesta. MX-verkkotunnuksen estäminen estää rekisteröitymisen mistä tahansa sähköpostiosoitteesta, joka käyttää samaa MX-verkkotunnusta, vaikka näkyvä verkkotunnuksen nimi olisikin erilainen. <strong>Varo estämästä suuria sähköpostipalvelujen tarjoajia.</strong>
       resolved_through_html: Ratkaistu verkkotunnuksen %{domain} kautta
       title: Estetyt sähköpostiverkkotunnukset
+    email_subscriptions:
+      accounts:
+        account: Tili
+        empty:
+          hint: Millään tilillä ei ole vielä tilaajia.
+          no_lists_yet: Ei vielä listoja
+        lead: Alla näkyvät tilit, jotka ovat ottaneet ominaisuuden käyttöön ja joilla on tilaajia.
+        status: Tila
+        subscribers: Tilaajia
+        title: Postituslistat
+      additional_footer_texts:
+        show:
+          title: Alatunnisteen lisäteksti
+      compliance_settings:
+        additional_footer_text:
+          action: Hallitse
+          title: Alatunnisteen lisäteksti
+        privacy_policy:
+          action: Hallitse
+          title: Tietosuojakäytäntö
+      danger_zone:
+        disable_feature:
+          action: Poista käytöstä
+          hint: Poista ominaisuus käytöstä kaikilta tileiltä
+          title: Poista ominaisuus käytöstä
+        title: Vaaravyöhyke
+      index:
+        disabled:
+          get_started: Aloita
+      roles:
+        edit_role: Muokkaa roolia
+        manage_roles: Hallitse rooleja
+        role_name: Roolin nimi
+        title: Roolit
+      setups:
+        show:
+          enable_feature: Ota ominaisuus käyttöön
+          important_information: Tärkeää tietoa
     export_domain_allows:
       new:
         title: Tuo sallittuja verkkotunnuksia
@@ -792,7 +830,6 @@ fi:
         manage_custom_emojis: Hallita mukautettuja emojeita
         manage_custom_emojis_description: Sallii käyttäjien hallita palvelimen mukautettuja emojeita
         manage_email_subscriptions: Hallita sähköpostitilauksia
-        manage_email_subscriptions_description: Sallii käyttäjien tilata sähköpostitse käyttäjiä, joilla on tämä käyttöoikeus
         manage_federation: Hallita federointia
         manage_federation_description: Sallii käyttäjien estää tai sallia federointi muiden verkkotunnusten kanssa ja hallita toimitusta
         manage_invites: Hallita kutsuja

config/locales/fr-CA.yml

@@ -792,7 +792,6 @@ fr-CA:
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_email_subscriptions: Gérer les abonnements par courriel
-        manage_email_subscriptions_description: Autoriser l'abonnement par courriel aux comptes ayant cette permission
         manage_federation: Gérer de la féderation
         manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison
         manage_invites: Gérer les invitations

config/locales/fr.yml

@@ -792,7 +792,6 @@ fr:
         manage_custom_emojis: Gérer les émojis personnalisés
         manage_custom_emojis_description: Permet aux utilisateur⋅rice⋅s de gérer les émoticônes personnalisées sur le serveur
         manage_email_subscriptions: Gérer les abonnements par courriel
-        manage_email_subscriptions_description: Autoriser l'abonnement par courriel aux comptes ayant cette permission
         manage_federation: Gérer de la féderation
         manage_federation_description: Permet aux utilisateur⋅rice⋅s de bloquer ou d'autoriser la fédération avec d'autres domaines, et de contrôler la capacité de livraison
         manage_invites: Gérer les invitations

config/locales/ga.yml

@@ -840,7 +840,6 @@ ga:
         manage_custom_emojis: Bainistigh Emojis Saincheaptha
         manage_custom_emojis_description: Ligeann sé d'úsáideoirí emojis saincheaptha a bhainistiú ar an bhfreastalaí
         manage_email_subscriptions: Bainistigh Síntiúis Ríomhphoist
-        manage_email_subscriptions_description: Ceadaigh d’úsáideoirí liostáil le húsáideoirí leis an gcead seo trí ríomhphost
         manage_federation: Cónaidhm a bhainistiú
         manage_federation_description: Ligeann sé d’úsáideoirí cónaidhm a bhlocáil nó a cheadú le fearainn eile, agus inseachadacht a rialú
         manage_invites: Bainistigh Cuirí

config/locales/gd.yml

@@ -824,7 +824,6 @@ gd:
         manage_custom_emojis: Stiùireadh nan Emojis gnàthaichte
         manage_custom_emojis_description: Leigidh seo le cleachdaichean Emojis gnàthaichte a stiùireadh air an fhrithealaiche
         manage_email_subscriptions: Stiùireadh fo-sgrìobhaidhean puist-d
-        manage_email_subscriptions_description: Leigidh seo le cleachdaichean fo-sgrìobhadh air a’ phost-d a dhèanamh air na cleachdaichean aig a bheil an cead seo
         manage_federation: Stiùireadh a’ cho-nasgaidh
         manage_federation_description: Leigidh seo le cleachdaichean an co-nasgadh le àrainnean eile a bhacadh no a cheadachadh agus stiùireadh dè ghabhas lìbhrigeadh
         manage_invites: Stiùireadh nan cuiridhean

config/locales/gl.yml

@@ -792,7 +792,6 @@ gl:
         manage_custom_emojis: Xestionar Emojis personalizados
         manage_custom_emojis_description: Permite xestionar os emojis personalizados do servidor
         manage_email_subscriptions: Xestionar subscripcións por correo
-        manage_email_subscriptions_description: Permitir que as usuarias se subscriban por correo a outras usuarias con este permiso
         manage_federation: Xestionar a federación
         manage_federation_description: Permite bloquear ou permitir a federación con outros dominios, e controlar as entregas
         manage_invites: Xestionar Convites

config/locales/he.yml

@@ -824,7 +824,6 @@ he:
         manage_custom_emojis: ניהול סמלונים בהתאמה אישית
         manage_custom_emojis_description: מאפשר למשתמשים לנהל סמלונים בהתאמה אישית של השרת
         manage_email_subscriptions: ניהול הרשמות דוא"ל
-        manage_email_subscriptions_description: לאפשר למשתמשיםות להרשים למשתמשיםות ע"י הרשאה בדוא"ל
         manage_federation: ניהול פדרציה
         manage_federation_description: מאפשר למשתמשים לחסום או לאפשר התממשקות עם שמות מתחם אחרים
         manage_invites: ניהול הזמנות

config/locales/hu.yml

@@ -792,7 +792,6 @@ hu:
         manage_custom_emojis: Egyedi emodzsik kezelése
         manage_custom_emojis_description: Lehetővé teszi a felhasználó számára, hogy a kiszolgáló egyéni emodzsiait kezelje
         manage_email_subscriptions: E-mail-feliratkozások kezelése
-        manage_email_subscriptions_description: Engedélyezés, hogy a felhasználók e-maillel feliratkozzanak az ilyen jogosultságú felhasználókra
         manage_federation: Föderáció kezelése
         manage_federation_description: Lehetővé teszi a felhasználó számára, hogy más domainnekkel való föderációt engedélyezzen vagy letiltson, illetve szabályozza a kézbesítést
         manage_invites: Meghívások kezelése

config/locales/is.yml

@@ -792,7 +792,6 @@ is:
         manage_custom_emojis: Sýsla með sérsniðin lyndistákn
         manage_custom_emojis_description: Leyfir notendum að sýsla með sérsniðin lyndistákn á netþjóninum
         manage_email_subscriptions: Sýsla með tölvupóstáskriftir
-        manage_email_subscriptions_description: Leyfa notendum að gerast áskrifendur að tölvupósti frá notendum með þessa heimild
         manage_federation: Sýsla með netþjónasambönd
         manage_federation_description: Leyfir notendum að loka á eða leyfa samþættingu við önnur lén (federation) og stýra afhendingu skilaboða
         manage_invites: Sýsla með boðsgesti

config/locales/it.yml

@@ -487,6 +487,9 @@ it:
       resolved_dns_records_hint_html: Il nome di dominio si risolve nei seguenti domini MX, che sono in ultima analisi responsabili dell'accettazione delle e-mail. Il blocco di un dominio MX bloccherà le registrazioni da qualsiasi indirizzo e-mail che utilizzi lo stesso dominio MX, anche se il nome di dominio visibile è diverso. <strong>Fai attenzione a non bloccare i principali provider di posta elettronica.</strong>
       resolved_through_html: Risolto attraverso %{domain}
       title: Domini e-mail bloccati
+    email_subscriptions:
+      accounts:
+        account: Account
     export_domain_allows:
       new:
         title: Importare i permessi di dominio
@@ -792,7 +795,6 @@ it:
         manage_custom_emojis: Gestisci emoji personalizzate
         manage_custom_emojis_description: Consente agli utenti di gestire emoji personalizzate sul server
         manage_email_subscriptions: Gestisci le iscrizioni via email
-        manage_email_subscriptions_description: Consenti agli utenti di iscriversi tramite email agli utenti, con questa autorizzazione
         manage_federation: Gestisci Federazione
         manage_federation_description: Consente agli utenti di bloccare o consentire la federazione con altri domini e controllare la consegnabilità
         manage_invites: Gestisci Inviti