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

Gemfile.lock

@@ -823,7 +823,7 @@ GEM
     sidekiq-scheduler (6.0.1)
       rufus-scheduler (~> 3.2)
       sidekiq (>= 7.3, < 9)
-    sidekiq-unique-jobs (8.0.11)
+    sidekiq-unique-jobs (8.0.13)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 7.0.0, < 9.0.0)
       thor (>= 1.0, < 3.0)

app/javascript/mastodon/locales/et.json

@@ -517,6 +517,7 @@
   "keyboard_shortcuts.column": "Fookus veerule",
   "keyboard_shortcuts.compose": "Fookus teksti koostamise alale",
   "keyboard_shortcuts.description": "Kirjeldus",
+  "keyboard_shortcuts.direct": "Ava privaatsete mainimiste veerg",
   "keyboard_shortcuts.down": "Liigu loetelus alla",
   "keyboard_shortcuts.enter": "Ava postitus",
   "keyboard_shortcuts.favourite": "Lemmikpostitus",

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

@@ -49,7 +49,7 @@
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
-  "account.followers_you_know_counter": "{count, plural, one {{counter} suivi}, other {{counter} suivis}}",
+  "account.followers_you_know_counter": "{counter} que vous suivez",
   "account.following": "Abonné·e",
   "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Ce compte ne suit personne présentement.",
@@ -164,10 +164,10 @@
   "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": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_mention": "Elle ne pourra pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
-  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.they_will_know": "Elle pourra voir qu'elle est bloquée.",
-  "block_modal.title": "Bloquer le compte ?",
+  "block_modal.title": "Bloquer cette personne ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
@@ -592,13 +592,13 @@
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous avez déménagé sur {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
-  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.indefinite": "Jusqu'à ce que je l'affiche à nouveau",
   "mute_modal.show_options": "Afficher les options",
-  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_can_mention_and_follow": "Elle pourra vous mentionner et vous suivre, mais vous ne la verrez pas.",
-  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.they_wont_know": "Elle ne saura pas qu'elle est masquée.",
-  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.title": "Masquer cette personne ?",
-  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui la mentionnent.",
-  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "mute_modal.you_wont_see_posts": "Elle pourra toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.account_settings": "Mot de passe et sécurité",
   "navigation_bar.administration": "Administration",
@@ -786,7 +786,7 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.quote.anyone": "{visibility}, n'importe qui peut citer",
+  "privacy.quote.anyone": "{visibility}, citations autorisées",
   "privacy.quote.disabled": "{visibility}, citations désactivées",
   "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",

app/javascript/mastodon/locales/fr.json

@@ -49,7 +49,7 @@
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
-  "account.followers_you_know_counter": "{count, plural, one {{counter} suivi}, other {{counter} suivis}}",
+  "account.followers_you_know_counter": "{counter} que vous suivez",
   "account.following": "Abonnements",
   "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
@@ -164,10 +164,10 @@
   "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": "Il ne peut pas vous mentionner ou vous suivre.",
+  "block_modal.they_cant_mention": "Elle ne pourra pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
-  "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
+  "block_modal.they_will_know": "Elle pourra voir qu'elle est bloquée.",
-  "block_modal.title": "Bloquer le compte ?",
+  "block_modal.title": "Bloquer cette personne ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
@@ -592,13 +592,13 @@
   "moved_to_account_banner.text": "Votre compte {disabledAccount} est actuellement désactivé parce que vous l'avez déplacé à {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cacher des notifications",
   "mute_modal.hide_options": "Masquer les options",
-  "mute_modal.indefinite": "Jusqu'à ce que je les réactive",
+  "mute_modal.indefinite": "Jusqu'à ce que je l'affiche à nouveau",
   "mute_modal.show_options": "Afficher les options",
-  "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
+  "mute_modal.they_can_mention_and_follow": "Elle pourra vous mentionner et vous suivre, mais vous ne la verrez pas.",
-  "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
+  "mute_modal.they_wont_know": "Elle ne saura pas qu'elle est masquée.",
-  "mute_modal.title": "Rendre cet utilisateur silencieux ?",
+  "mute_modal.title": "Masquer cette personne ?",
-  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui la mentionnent.",
-  "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "mute_modal.you_wont_see_posts": "Elle pourra toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.account_settings": "Mot de passe et sécurité",
   "navigation_bar.administration": "Administration",
@@ -786,7 +786,7 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
-  "privacy.quote.anyone": "{visibility}, n'importe qui peut citer",
+  "privacy.quote.anyone": "{visibility}, citations autorisées",
   "privacy.quote.disabled": "{visibility}, citations désactivées",
   "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",

app/javascript/mastodon/locales/ga.json

@@ -101,9 +101,9 @@
   "admin.impact_report.instance_follows": "Leanúna a bheadh ​​​​a n-úsáideoirí chailleadh",
   "admin.impact_report.title": "Achoimre ar an tionchar",
   "alert.rate_limited.message": "Atriail aris tar éis {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Rátatheoranta",
+  "alert.rate_limited.title": "Ráta teoranta",
   "alert.unexpected.message": "Tharla earráid gan choinne.",
-  "alert.unexpected.title": "Hiúps!",
+  "alert.unexpected.title": "Úps!",
   "alt_text_badge.title": "Téacs alt",
   "alt_text_modal.add_alt_text": "Cuir téacs alt leis",
   "alt_text_modal.add_text_from_image": "Cuir téacs ón íomhá leis",
@@ -150,7 +150,7 @@
   "annual_report.summary.highlighted_post.reply_count": "Fuair ​​an post seo {count, plural, one {freagra amháin} two {# freagraí} few {# freagraí} many {# freagraí} other {# freagraí}}.",
   "annual_report.summary.highlighted_post.title": "An post is mó tóir",
   "annual_report.summary.most_used_app.most_used_app": "aip is mó a úsáidtear",
-  "annual_report.summary.most_used_hashtag.most_used_hashtag": "hashtag is mó a úsáidtear",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "haischlib is mó a úsáidtear",
   "annual_report.summary.most_used_hashtag.used_count": "Chuir tú an haischlib seo i {count, plural, one {post amháin} two {# poist} few {# poist} many {# poist} other {# poist}}.",
   "annual_report.summary.most_used_hashtag.used_count_public": "Chuir {name} an haischlib seo i {count, plural, one {post amháin} two {# poist} few {# poist} many {# poist} other {# poist}}.",
   "annual_report.summary.new_posts.new_posts": "postanna nua",
@@ -167,14 +167,14 @@
   "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": "An bhfuil fonn ort an t-úsáideoir a bhlocáil?",
+  "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?",
   "bundle_column_error.copy_stacktrace": "Cóipeáil tuairisc earráide",
   "bundle_column_error.error.body": "Ní féidir an leathanach a iarradh a sholáthar. Seans gurb amhlaidh mar gheall ar fhabht sa chód, nó mar gheall ar mhíréireacht leis an mbrabhsálaí.",
-  "bundle_column_error.error.title": "Ó, níl sé sin go maith!",
+  "bundle_column_error.error.title": "Ó, ní hea!",
   "bundle_column_error.network.body": "Tharla earráid agus an leathanach á lódáil. Seans gur mar gheall ar fhadhb shealadach le do nasc idirlín nó i ndáil leis an bhfreastalaí seo atá sé.",
   "bundle_column_error.network.title": "Earráid líonra",
   "bundle_column_error.retry": "Bain triail as arís",

app/javascript/mastodon/locales/it.json

@@ -536,7 +536,7 @@
   "keyboard_shortcuts.open_media": "Apre i multimedia",
   "keyboard_shortcuts.pinned": "Apre l'elenco dei post fissati",
   "keyboard_shortcuts.profile": "Apre il profilo dell'autore",
-  "keyboard_shortcuts.quote": "Cita il post",
+  "keyboard_shortcuts.quote": "Cita post",
   "keyboard_shortcuts.reply": "Risponde al post",
   "keyboard_shortcuts.requests": "Apre l'elenco delle richieste di seguirti",
   "keyboard_shortcuts.search": "Focalizza sulla barra di ricerca",

app/javascript/mastodon/locales/ms.json

@@ -1,6 +1,7 @@
 {
   "about.blocks": "Pelayan yang diselaraskan",
   "about.contact": "Hubungi:",
+  "about.default_locale": "Lalai",
   "about.disclaimer": "Mastodon ialah perisian sumber terbuka percuma, dan merupakan tanda dagangan Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Sebab tidak tersedia",
   "about.domain_blocks.preamble": "Secara amnya, Mastodon membenarkan anda melihat kandungan pengguna daripada mana-mana pelayan dalam alam bersekutu dan berinteraksi dengan mereka. Berikut ialah pengecualian yang khusus pada pelayan ini.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Terhad",
   "about.domain_blocks.suspended.explanation": "Tiada data daripada pelayan ini yang akan diproses, disimpan atau ditukar, menjadikan sebarang interaksi atau perhubungan dengan pengguna daripada pelayan ini adalah mustahil.",
   "about.domain_blocks.suspended.title": "Digantung",
+  "about.language_label": "Bahasa",
   "about.not_available": "Maklumat ini belum tersedia pada pelayan ini.",
   "about.powered_by": "Media sosial terpencar yang dikuasakan oleh {mastodon}",
   "about.rules": "Peraturan pelayan",
@@ -26,6 +28,7 @@
   "account.disable_notifications": "Berhenti maklumkan saya apabila @{name} mengirim hantaran",
   "account.domain_blocking": "Blocking domain",
   "account.edit_profile": "Sunting profil",
+  "account.edit_profile_short": "Sunting",
   "account.enable_notifications": "Maklumi saya apabila @{name} mengirim hantaran",
   "account.endorse": "Tampilkan di profil",
   "account.familiar_followers_one": "melayuikutikut{name1}",

app/javascript/mastodon/locales/pl.json

@@ -113,11 +113,37 @@
   "alt_text_modal.describe_for_people_with_visual_impairments": "Opisz to dla osób niedowidzących…",
   "alt_text_modal.done": "Gotowe",
   "announcement.announcement": "Ogłoszenie",
+  "annual_report.announcement.action_build": "Zbuduj mój Wrapstodon",
+  "annual_report.announcement.action_dismiss": "Nie, dziękuję",
+  "annual_report.announcement.action_view": "Zobacz mój Wrapstodon",
+  "annual_report.announcement.description": "Odkryj więcej na temat swojego zaangażowania w Mastodon w ciągu ostatniego roku.",
+  "annual_report.announcement.title": "Wrapstodon roku {year} przybył",
+  "annual_report.nav_item.badge": "Nowe",
+  "annual_report.shared_page.donate": "Wesprzyj nas",
+  "annual_report.shared_page.footer": "Wygenerowane przez {heart} przez zespół Mastodon",
+  "annual_report.shared_page.footer_server_info": "{username} używa {domain}, jednej z wielu społeczności wspieranych przez Mastodon.",
+  "annual_report.summary.archetype.booster.desc_public": "{name} został na polowaniu na posty do wzmocnienia, wzmacniając innych twórców doskonałym celem.",
+  "annual_report.summary.archetype.booster.desc_self": "Pozostałeś na polowaniu na posty do wzmocnienia i wzmocnienia innych twórców doskonałym celem.",
+  "annual_report.summary.archetype.booster.name": "Łucznik",
+  "annual_report.summary.archetype.die_drei_fragezeichen": "???",
+  "annual_report.summary.archetype.lurker.name": "Stoik",
+  "annual_report.summary.archetype.oracle.name": "Wyrocznia",
+  "annual_report.summary.archetype.pollster.name": "Zastanawiacz",
+  "annual_report.summary.archetype.replier.name": "Motylek",
+  "annual_report.summary.archetype.reveal": "Pokaż mój archetyp",
+  "annual_report.summary.archetype.title_public": "Archetyp {name}",
+  "annual_report.summary.archetype.title_self": "Twój archetyp",
+  "annual_report.summary.close": "Zamknij",
+  "annual_report.summary.copy_link": "Skopiuj adres",
+  "annual_report.summary.followers.new_followers": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
   "annual_report.summary.most_used_app.most_used_app": "najczęściej używana aplikacja",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "najczęściej używany hashtag",
   "annual_report.summary.new_posts.new_posts": "nowe wpisy",
   "annual_report.summary.percentile.text": "<topLabel>To plasuje cię w czołówce</topLabel><percentage></percentage><bottomLabel> użytkowników {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Nie powiemy Berniemu.",
+  "annual_report.summary.share_elsewhere": "Udostępnij gdziekolwiek",
+  "annual_report.summary.share_message": "Mam archetyp {archetype}!",
+  "annual_report.summary.share_on_mastodon": "Udostępnij na Mastodonie",
   "attachments_list.unprocessed": "(nieprzetworzone)",
   "audio.hide": "Ukryj dźwięk",
   "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.",
@@ -159,6 +185,7 @@
   "column.edit_list": "Edytuj listę",
   "column.favourites": "Ulubione",
   "column.firehose": "Aktualności",
+  "column.firehose_local": "Kanał na żywo dla tego serwera",
   "column.firehose_singular": "Na żywo",
   "column.follow_requests": "Prośby o obserwację",
   "column.home": "Strona główna",
@@ -179,6 +206,7 @@
   "community.column_settings.local_only": "Tylko lokalne",
   "community.column_settings.media_only": "Tylko multimedia",
   "community.column_settings.remote_only": "Tylko zdalne",
+  "compose.error.blank_post": "Post nie może być pusty.",
   "compose.language.change": "Zmień język",
   "compose.language.search": "Wyszukaj języki...",
   "compose.published.body": "Wpis został opublikowany.",
@@ -231,6 +259,11 @@
   "confirmations.missing_alt_text.secondary": "Opublikuj mimo wszystko",
   "confirmations.missing_alt_text.title": "Dodać tekst pomocniczy?",
   "confirmations.mute.confirm": "Wycisz",
+  "confirmations.private_quote_notify.cancel": "Wróć do edycji",
+  "confirmations.private_quote_notify.confirm": "Opublikuj wpis",
+  "confirmations.private_quote_notify.do_not_show_again": "Nie pokazuj tej wiadomości ponownie",
+  "confirmations.private_quote_notify.message": "Osoba, którą cytujesz, a inne wzmianki zostaną powiadomione i będą mogły zobaczyć Twój post, nawet jeśli nie obserwują Ciebie.",
+  "confirmations.private_quote_notify.title": "Udostępnić obserwującym i wspomnianym użytkownikom?",
   "confirmations.quiet_post_quote_info.dismiss": "Nie przypominaj mi ponownie",
   "confirmations.quiet_post_quote_info.got_it": "Rozumiem",
   "confirmations.quiet_post_quote_info.message": "Kiedy cytujesz niewidoczny wpis publiczny, twój wpis zostanie ukryty z popularnych osi czasu.",
@@ -388,6 +421,9 @@
   "follow_suggestions.who_to_follow": "Kogo warto obserwować",
   "followed_tags": "Obserwowane hasztagi",
   "footer.about": "O serwerze",
+  "footer.about_mastodon": "O Mastodonie",
+  "footer.about_server": "O {domain}",
+  "footer.about_this_server": "O nas",
   "footer.directory": "Katalog profili",
   "footer.get_app": "Pobierz aplikację",
   "footer.keyboard_shortcuts": "Skróty klawiszowe",

app/lib/activitypub/tag_manager.rb

@@ -62,6 +62,8 @@ class ActivityPub::TagManager
       emoji_url(target)
     when :flag
       target.uri
+    when :featured_collection
+      ap_account_featured_collection_url(target.account.id, target)
     end
   end
 

app/models/collection.rb

@@ -60,6 +60,10 @@ class Collection < ApplicationRecord
     self.tag = Tag.find_or_create_by_names(new_name).first
   end
 
+  def object_type
+    :featured_collection
+  end
+
   private
 
   def tag_is_usable

app/serializers/activitypub/featured_collection_serializer.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class ActivityPub::FeaturedCollectionSerializer < ActivityPub::Serializer
+  class FeaturedItemSerializer < ActivityPub::Serializer
+    attributes :type, :featured_object, :featured_object_type
+
+    def type
+      'FeaturedItem'
+    end
+
+    def featured_object
+      ActivityPub::TagManager.instance.uri_for(object.account)
+    end
+
+    def featured_object_type
+      object.account.actor_type || 'Person'
+    end
+  end
+
+  attributes :id, :type, :total_items, :name, :summary, :attributed_to,
+             :sensitive, :discoverable, :published, :updated
+
+  has_one :tag, key: :topic, serializer: ActivityPub::NoteSerializer::TagSerializer
+
+  has_many :collection_items, key: :ordered_items, serializer: FeaturedItemSerializer
+
+  def id
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+
+  def type
+    'FeaturedCollection'
+  end
+
+  def summary
+    object.description
+  end
+
+  def attributed_to
+    ActivityPub::TagManager.instance.uri_for(object.account)
+  end
+
+  def total_items
+    object.collection_items.size
+  end
+
+  def published
+    object.created_at.iso8601
+  end
+
+  def updated
+    object.updated_at.iso8601
+  end
+end

config/locales/activerecord.ms.yml

@@ -15,9 +15,16 @@ ms:
       user/invite_request:
         text: Sebab
     errors:
+      attributes:
+        domain:
+          invalid: bukanlah nama domain yang sah
+      messages:
+        invalid_domain_on_line: "%{value} bukanlah nama domain yang sah"
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: mengandungi nilai dengan label yang hilang
             username:
               invalid: hanya mengandungi aksara, nombor dan garis bawah sahaja
               reserved: dikhaskan
@@ -25,6 +32,12 @@ ms:
           attributes:
             url:
               invalid: bukanlah URL yang sah
+        collection:
+          attributes:
+            collection_items:
+              too_many: terlalu banyak, tidak lebih daripada %{count} dibenarkan
+            tag:
+              unusable: mungkin tidak digunakan
         doorkeeper/application:
           attributes:
             website:
@@ -33,12 +46,23 @@ ms:
           attributes:
             data:
               malformed: tersalah bentuk
+        list_account:
+          attributes:
+            account_id:
+              taken: sudah dalam senarai
+          must_be_following: hendaklah akaun yang diikuti
         status:
           attributes:
             reblog:
               taken: hantaran sudah wujud
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: terlalu awal, hendaklah selepas %{date}
         user:
           attributes:
+            date_of_birth:
+              below_limit: di bawah had umur
             email:
               blocked: menggunakan pembekal e-mel yang tidak dibenarkan
               unreachable: nampaknya tidak wujud

config/locales/devise.fr.yml

@@ -24,7 +24,7 @@ fr:
         action_with_app: Confirmer et retourner à %{app}
         explanation: Vous avez créé un compte sur %{host} avec cette adresse courriel. Vous êtes à un clic de l’activer. Si ce n’était pas vous, veuillez ignorer ce courriel.
         explanation_when_pending: Vous avez demandé à vous inscrire à %{host} avec cette adresse de courriel. Une fois que vous aurez confirmé cette adresse, nous étudierons votre demande. Vous ne pourrez pas vous connecter d’ici-là. Si votre demande est refusée, vos données seront supprimées du serveur, aucune action supplémentaire de votre part n’est donc requise. Si vous n’êtes pas à l’origine de cette demande, veuillez ignorer ce message.
-        extra_html: Merci de consultez également <a href="%{terms_path}">les règles du serveur</a> et <a href="%{policy_path}">nos conditions d’utilisation</a>.
+        extra_html: Merci de consulter également <a href="%{terms_path}">les règles du serveur</a> et <a href="%{policy_path}">nos conditions d’utilisation</a>.
         subject: 'Mastodon : Merci de confirmer votre inscription sur %{instance}'
         title: Vérifiez l’adresse de courriel
       email_changed:

config/locales/et.yml

@@ -38,7 +38,7 @@ et:
       add_email_domain_block: Blokeeri e-posti domeen
       approve: Võta vastu
       approved_msg: Kasutaja %{username} liitumisavaldus rahuldatud
-      are_you_sure: Oled kindel?
+      are_you_sure: Kas oled kindel?
       avatar: Profiilipilt
       by_domain: Domeen
       change_email:
@@ -47,7 +47,7 @@ et:
         label: Muuda e-posti aadressi
         new_email: Uus е-posti aadress
         submit: Muuda e-posti aadressi
-        title: Muuda e-postiaadressi kasutajale %{username}
+        title: Muuda kasutaja %{username} e-posti aadressi
       change_role:
         changed_msg: Roll on muudetud!
         edit_roles: Halda kasutaja rolle
@@ -1973,9 +1973,11 @@ et:
     enabled: Vanade postituste automaatne kustutamine
     enabled_hint: Kustutab automaatselt postitused, mis ületavad määratud ajalimiiti, välja arvatud allpool toodud erandite puhul
     exceptions: Erandid
+    explanation: Automaatne kustutamine toimib madala prioriteetusega protsessi abil. Vanuse ülempiiri ja tegeliku kustutamise vahel võib seetõttu tekkida viivitus.
     ignore_favs: Eira lemmikuid
     ignore_reblogs: Eira jagamisi
     interaction_exceptions: Interaktsioonidel põhinevad erandid
+    interaction_exceptions_explanation: Postitused, mis ajutiselt ületavad lemmikuks lisamise või hooandmise künnise, võivad jääda alles isegi siis, kui nimetatud tegevuste arv hiljem väheneb.
     keep_direct: Säilita otsesõnumid
     keep_direct_hint: Ei kustuta otsesõnumeid
     keep_media: Meedialisanditega postituste säilitamine
@@ -2190,6 +2192,7 @@ et:
       error: Turvavõtme kustutamisel tekkis tõrge. Palun proovi uuesti.
       success: Turvavõtmed edukalt kustutatud.
     invalid_credential: Vigane turvavõti
+    nickname: Hüüdnimi
     nickname_hint: Uue turvavõtme hüüdnimi
     not_enabled: Veebiautentimine pole sisse lülitatud
     not_supported: See veebilehitseja ei toeta turvavõtmeid

config/locales/ga.yml

@@ -2104,9 +2104,11 @@ ga:
     enabled: Scrios seanphostálacha go huathoibríoch
     enabled_hint: Scriostar do phostálacha go huathoibríoch nuair a shroicheann siad tairseach aoise sonraithe, ach amháin má thagann siad le ceann de na heisceachtaí thíos
     exceptions: Eisceachtaí
+    explanation: Déantar scriosadh uathoibrithe le tosaíocht íseal. D’fhéadfadh moill a bheith ann idir an aois a shroichtear agus an bhaint.
     ignore_favs: Tabhair neamhaird ar toghanna
     ignore_reblogs: Déan neamhaird de boosts
     interaction_exceptions: Eisceachtaí bunaithe ar idirghníomhaíochtaí
+    interaction_exceptions_explanation: Féadfar poist a sháraíonn an tairseach is fearr leat nó an tairseach borrtha a choinneáil fiú má laghdaítear iad níos déanaí.
     keep_direct: Coinnigh teachtaireachtaí díreacha
     keep_direct_hint: Ní scriosann sé aon cheann de do theachtaireachtaí díreacha
     keep_media: Coinnigh postálacha le ceangaltáin meán
@@ -2322,6 +2324,7 @@ ga:
       error: Bhí fadhb ann agus d'eochair shlándála á scriosadh. Arís, le d'thoil.
       success: Scriosadh d'eochair shlándála go rathúil.
     invalid_credential: Eochair shlándála neamhbhailí
+    nickname: Leasainm
     nickname_hint: Cuir isteach leasainm d'eochair shlándála nua
     not_enabled: Níl WebAuthn cumasaithe agat fós
     not_supported: Ní thacaíonn an brabhsálaí seo le heochracha slándála

config/locales/nan.yml

@@ -1681,6 +1681,74 @@ nan:
       subject: Lí有收著管理ê警告
     poll:
       subject: "%{name} 舉辦ê投票suah ah"
+    quote:
+      body: Lí ê PO文hōo %{name} 引用：
+      subject: "%{name} 引用lí ê PO文"
+      title: 新ê引用
+    quoted_update:
+      subject: "%{name} 編輯lí有引用ê PO文"
+    reblog:
+      body: Lí ê PO文hōo %{name} 轉送：
+      subject: "%{name} 轉送lí ê PO文"
+      title: 新ê轉送
+    severed_relationships:
+      subject: 因為管理ê決定，lí失去聯絡ah
+    status:
+      subject: "%{name} 頭tú-á PO文"
+    update:
+      subject: "%{name} 有編輯PO文"
+  notifications:
+    administration_emails: 管理員ê電子phue通知
+    email_events: 電子phue通知ê事件
+    email_events_hint: 揀lí想beh收ê通知ê事件：
+  number:
+    human:
+      decimal_units:
+        format: "%n%u"
+        units:
+          billion: B
+          million: M
+          quadrillion: Q
+          thousand: K
+          trillion: T
+  otp_authentication:
+    code_hint: 請輸入lí ê驗證應用程式生成ê code，來確認
+    description_html: Nā lí啟用用驗證應用程式ê<strong>雙因素驗證</strong>，登入需要lí有手機á，伊ê產生token hōo lí輸入。
+    enable: 啟用
+    instructions_html: "<strong>請用lí手機á ê TOTP應用程式（親像Google Authenticator）掃描tsit ê QR code</strong>。對tsit-má起，hit ê應用程式ê生token，佇lí登入ê時陣著輸入。"
+    manual_instructions: 若lí bē當掃描 QR code，需要手動輸入下kha ê光碼：
+    setup: 設定
+    wrong_code: Lí輸入ê碼無效！服侍器時間kap設備時間kám lóng正確？
+  pagination:
+    newer: 較新ê
+    next: 後一頁
+    older: 較舊ê
+    prev: 頂一頁
+    truncate: "&hellip;"
+  polls:
+    errors:
+      already_voted: Lí有投票ah
+      duplicate_options: 包含重覆ê項目
+      duration_too_long: 傷久ah
+      duration_too_short: 傷緊ah
+      expired: 投票結束ah
+      invalid_choice: 所揀ê選項無佇leh
+      over_character_limit: Bē當比 %{max} ê字元tsē
+      self_vote: Lí bē當佇lí開ê投票投
+      too_few_options: 項目定著愛超過一ê
+      too_many_options: Bē當包含超過 %{max} ê項目
+    vote: 投票
+  posting_defaults:
+    explanation: Tsiah ê設定ē用做預設ê值，若lí開新ê PO文，毋過lí會當佇編輯器內底，個別編輯PO文。
+  preferences:
+    other: 其他
+    posting_defaults: PO文預設值
+    public_timelines: 公共ê時間線
+  privacy:
+    hint_html: "<strong>自訂lí beh án-nuá hōo lí ê個人資料kap PO文受lâng發現。</strong>Mastodon ê tsē-tsē功能nā是拍開，通幫tsān lí接觸kàu較闊ê觀眾。請開一寡時間重看tsiah ê設定，確認in合lí ê使用例。"
+    privacy: 隱私權
+    privacy_hint_html: 控制lí想欲為別lâng ê利益，公開guā tsē內容。Lâng用瀏覽別lâng ê跟tuè koh看in用啥物應用程式PO文，來發現心適ê個人資料kap時行ê應用程式，但是lí凡勢beh保持khàm起來。
+    reach: 接觸
   scheduled_statuses:
     too_soon: Tio̍h用未來ê日期。
   statuses:

config/locales/pl.yml

@@ -866,10 +866,21 @@ pl:
         publish_statistics: Publikuj statystyki
         title: Odkrywanie
         trends: Trendy
+        wrapstodon: Wrapstodon
       domain_blocks:
         all: Każdemu
         disabled: Nikomu
         users: Zalogowanym lokalnym użytkownikom
+      feed_access:
+        modes:
+          authenticated: tylko zalogowani użytkownicy
+          disabled: Wymagaj określonej roli użytkownika
+          public: Wszyscy
+      landing_page:
+        values:
+          about: O nas
+          local_feed: Lokalny kanał
+          trends: Trendy
       registrations:
         moderation_recommandation: Upewnij się, że masz adekwatny i szybko reagujący zespół moderacyjny przed otwarciem rejestracji!
         preamble: Kontroluj, kto może utworzyć konto na Twoim serwerze.
@@ -923,6 +934,7 @@ pl:
       no_status_selected: Żaden wpis nie został zmieniony, bo żaden nie został wybrany
       open: Otwarty post
       original_status: Oryginalny post
+      quotes: Cytaty
       reblogs: Podbicia
       replied_to_html: Odpowiedziano na %{acct_link}
       status_changed: Post zmieniony
@@ -1209,6 +1221,7 @@ pl:
     hint_html: Jeżeli chcesz przenieść się z innego konta na to, możesz utworzyć alias, który jest wymagany zanim zaczniesz przenoszenie obserwacji z poprzedniego konta na to. To działanie <strong>nie wyrządzi szkód i jest odwracalne</strong>. <strong>Migracja konta jest inicjowana ze starego konta</strong>.
     remove: Odłącz alias
   appearance:
+    advanced_settings: Ustawienia zaawansowane
     animations_and_accessibility: Animacje i dostępność
     discovery: Odkrywanie
     localization:
@@ -1326,6 +1339,13 @@ pl:
     hint_html: "<strong>Informacja:</strong> Nie będziemy prosić Cię o ponowne podanie hasła przez następną godzinę."
     invalid_password: Nieprawidłowe hasło
     prompt: Potwierdź hasło, aby kontynuować
+  color_scheme:
+    auto: Automatyczne
+    dark: Ciemny
+    light: Jasny
+  contrast:
+    auto: Automatyczny
+    high: Wysoki
   crypto:
     errors:
       invalid_key: nie jest prawidłowym kluczem Ed25519 lub Curve25519
@@ -1651,6 +1671,10 @@ pl:
       expires_at: Wygaśnie po
       uses: Użycia
     title: Zaproś użytkowników
+  link_preview:
+    author_html: Przez %{name}
+    potentially_sensitive_content:
+      action: Kliknij, aby pokazać
   lists:
     errors:
       limit: Przekroczono maksymalną liczbę utworzonych list

config/locales/simple_form.pl.yml

@@ -237,6 +237,8 @@ pl:
         setting_always_send_emails: Zawsze wysyłaj powiadomienia e-mail
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Kontroluj widoczność podbić
+        setting_color_scheme: Tryb
+        setting_contrast: Kontrast
         setting_default_language: Język wpisów
         setting_default_privacy: Widoczność wpisów
         setting_default_quote_policy: Kto może cytować
@@ -286,6 +288,7 @@ pl:
         content_cache_retention_period: Okres zachowywania zdalnych treści
         custom_css: Niestandardowy CSS
         favicon: Favicon
+        landing_page: Strona docelowa dla nowych odwiedzających
         local_live_feed_access: Uzyskaj dostęp do kanałów zawierających lokalne wpisy
         local_topic_feed_access: Uzyskaj dostęp do hashtagów i linków zawierających lokalne wpisy
         mascot: Własna ikona
@@ -310,6 +313,7 @@ pl:
         thumbnail: Miniaturka serwera
         trendable_by_default: Zezwalaj na trendy bez wcześniejszego przeglądu
         trends: Włącz trendy
+        wrapstodon: Włącz Wrapstodon
       interactions:
         must_be_follower: Nie wyświetlaj powiadomień od osób, które Cię nie obserwują
         must_be_following: Nie wyświetlaj powiadomień od osób, których nie obserwujesz
@@ -370,7 +374,9 @@ pl:
         jurisdiction: Jurysdykcja
         min_age: Wiek minimalny
       user:
+        date_of_birth_1i: Rok
         date_of_birth_2i: Miesiąc
+        date_of_birth_3i: Dzień
         role: Rola
         time_zone: Strefa czasowa
       user_role:

config/locales/zh-CN.yml

@@ -2146,6 +2146,7 @@ zh-CN:
       error: 删除你的安全密钥时出错。请重试。
       success: 你的安全密钥已成功删除。
     invalid_credential: 无效的安全密钥
+    nickname: 昵称
     nickname_hint: 输入你的新安全密钥的昵称
     not_enabled: 你尚未启用WebAuthn
     not_supported: 此浏览器不支持安全密钥

config/locales/zh-TW.yml

@@ -1437,7 +1437,7 @@ zh-TW:
       statuses_hint_html: 此過濾器會套用至所選之各別嘟文，無論其是否符合下列關鍵字。<a href="%{path}">審閱或自過濾條件移除嘟文</a>。
       title: 編輯過濾條件
     errors:
-      deprecated_api_multiple_keywords: 這些參數無法自此應用程式中更改，因為它們適用於一或多個過濾器關鍵字。請使用較新的應用程式或是網頁介面。
+      deprecated_api_multiple_keywords: 這些參數無法自此應用程式中更改，因為它們適用於一個以上之過濾器關鍵字。請使用較新的應用程式或是網頁介面。
       invalid_context: 沒有提供內文或內文無效
     index:
       contexts: "%{contexts} 中的過濾器"
@@ -1737,7 +1737,7 @@ zh-TW:
       invalid_choice: 您所選的投票選項並不存在
       over_character_limit: 不能多於 %{max} 個字元
       self_vote: 您無法於您的嘟文投票
-      too_few_options: 必須包含至少一個項目
+      too_few_options: 必須包含一個項目以上
       too_many_options: 不能包含多於 %{max} 個項目
     vote: 投票
   posting_defaults:

config/routes.rb

@@ -96,6 +96,7 @@ Rails.application.routes.draw do
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 
   concern :account_resources do
+    resources :featured_collections, only: [:show]
     resources :followers, only: [:index], controller: :follower_accounts
     resources :following, only: [:index], controller: :following_accounts
 

spec/fabricators/collection_fabricator.rb

@@ -8,3 +8,10 @@ Fabricator(:collection) do
   sensitive    false
   discoverable true
 end
+
+Fabricator(:remote_collection, from: :collection) do
+  account { Fabricate.build(:remote_account) }
+  local false
+  uri { sequence(:uri) { |i| "https://example.com/collections/#{i}" } }
+  original_number_of_items 0
+end

spec/lib/activitypub/tag_manager_spec.rb

@@ -192,6 +192,23 @@ RSpec.describe ActivityPub::TagManager do
         expect(subject.uri_for(status.conversation)).to eq status.conversation.uri
       end
     end
+
+    context 'with a local collection' do
+      let(:collection) { Fabricate(:collection) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.uri_for(collection))
+          .to eq("#{host_prefix}/ap/users/#{collection.account.id}/featured_collections/#{collection.id}")
+      end
+    end
+
+    context 'with a remote collection' do
+      let(:collection) { Fabricate(:remote_collection) }
+
+      it 'returns the expected URL' do
+        expect(subject.uri_for(collection)).to eq collection.uri
+      end
+    end
   end
 
   describe '#key_uri_for' do

spec/models/collection_spec.rb

@@ -126,4 +126,10 @@ RSpec.describe Collection do
       end
     end
   end
+
+  describe '#object_type' do
+    it 'returns `:featured_collection`' do
+      expect(subject.object_type).to eq :featured_collection
+    end
+  end
 end

spec/serializers/activitypub/featured_collection_serializer_spec.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::FeaturedCollectionSerializer do
+  subject { serialized_record_json(collection, described_class, adapter: ActivityPub::Adapter) }
+
+  let(:collection) do
+    Fabricate(:collection,
+              name: 'Incredible people',
+              description: 'These are really amazing',
+              tag_name: '#people',
+              discoverable: false)
+  end
+  let!(:collection_items) { Fabricate.times(2, :collection_item, collection:) }
+
+  it 'serializes to the expected structure' do
+    expect(subject).to include({
+      'type' => 'FeaturedCollection',
+      'id' => ActivityPub::TagManager.instance.uri_for(collection),
+      'name' => 'Incredible people',
+      'summary' => 'These are really amazing',
+      'attributedTo' => ActivityPub::TagManager.instance.uri_for(collection.account),
+      'sensitive' => false,
+      'discoverable' => false,
+      'topic' => {
+        'href' => match(%r{/tags/people$}),
+        'type' => 'Hashtag',
+        'name' => '#people',
+      },
+      'totalItems' => 2,
+      'orderedItems' => [
+        {
+          'type' => 'FeaturedItem',
+          'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.first.account),
+          'featuredObjectType' => 'Person',
+        },
+        {
+          'type' => 'FeaturedItem',
+          'featuredObject' => ActivityPub::TagManager.instance.uri_for(collection_items.last.account),
+          'featuredObjectType' => 'Person',
+        },
+      ],
+      'published' => match_api_datetime_format,
+      'updated' => match_api_datetime_format,
+    })
+  end
+end

spec/support/browser_errors.rb

@@ -4,6 +4,10 @@ module BrowserErrorsHelpers
   def ignore_js_error(error)
     @ignored_js_errors_for_spec << error
   end
+
+  def error_message(error)
+    error.keys.map { |key| "#{key.to_s.titleize}: #{error[key]}" }.join("\n")
+  end
 end
 
 RSpec.configure do |config|
@@ -15,7 +19,7 @@ RSpec.configure do |config|
     example.metadata[:js_console_messages] ||= []
     Capybara.current_session.driver.with_playwright_page do |page|
       page.on('console', lambda { |msg|
-        example.metadata[:js_console_messages] << { type: msg.type, text: msg.text, location: msg.location }
+        example.metadata[:js_console_messages] << { type: msg.type, text: msg.text, location: msg.location, page: msg.page.url }
       })
     end
   end
@@ -34,7 +38,7 @@ RSpec.configure do |config|
     if errors.present?
       aggregate_failures 'browser errrors' do
         errors.each do |error|
-          expect(error[:type]).to_not eq('error'), error[:text]
+          expect(error[:type]).to_not eq('error'), error_message(error)
           next unless error[:type] == 'warning'
 
           warn 'WARN: browser warning'

yarn.lock

@@ -2819,10 +2819,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ioredis/commands@npm:1.4.0":
+"@ioredis/commands@npm:1.5.0":
-  version: 1.4.0
+  version: 1.5.0
-  resolution: "@ioredis/commands@npm:1.4.0"
+  resolution: "@ioredis/commands@npm:1.5.0"
-  checksum: 10c0/99afe21fba794f84a2b84cceabcc370a7622e7b8b97a6589456c07c9fa62a15d54c5546f6f7214fb9a2458b1fa87579d5c531aaf48e06cc9be156d5923892c8d
+  checksum: 10c0/2d192d967a21f0192e17310d27ead02b0bdd504e834c782714abe641190ebfb548ad307fd89fd2d80db97c462afdc69ab4a4383831ab64ce61fe92f130d8b466
   languageName: node
   linkType: hard
 
@@ -8763,10 +8763,10 @@ __metadata:
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.8.2
+  version: 5.9.1
-  resolution: "ioredis@npm:5.8.2"
+  resolution: "ioredis@npm:5.9.1"
   dependencies:
-    "@ioredis/commands": "npm:1.4.0"
+    "@ioredis/commands": "npm:1.5.0"
     cluster-key-slot: "npm:^1.1.0"
     debug: "npm:^4.3.4"
     denque: "npm:^2.1.0"
@@ -8775,7 +8775,7 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/305e385f811d49908899e32c2de69616cd059f909afd9e0a53e54f596b1a5835ee3449bfc6a3c49afbc5a2fd27990059e316cc78f449c94024957bd34c826d88
+  checksum: 10c0/0993372ac380332d487e329882f247254a77dbf2d6f746e67c2211b50dda8067c0bce16c120b77ffe1eb693766dc4f36fac8cf5679231ab0c27671e34ef13449
   languageName: node
   linkType: hard
 
@@ -14333,11 +14333,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.6
+  version: 10.1.0
-  resolution: "use-debounce@npm:10.0.6"
+  resolution: "use-debounce@npm:10.1.0"
   peerDependencies:
     react: "*"
-  checksum: 10c0/f0745de48fc344e6f90ea24384f3c79bf0733d06649827241135847abd67ee8db32f523d490c3276bce9f5a6867194ab1c0187bf6b84cabe1dd679037f4a527e
+  checksum: 10c0/1d2c9ab71be283f7ea9f9c78f3574aeb6ff6fbcb18a9c5daf7f633521a8978f14d190016d39fd773227e40e9929e223677bb311343dadf33ee0763ef24bff510
   languageName: node
   linkType: hard