diff --git a/.nvmrc b/.nvmrc
index cecb936289..1bdd901e66 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.15
+20.16
diff --git a/Gemfile b/Gemfile
index 135b94c773..de9bc45f32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'json-ld'
gem 'json-ld-preloaded', '~> 3.2'
gem 'rdf-normalize', '~> 0.5'
-gem 'opentelemetry-api', '~> 1.2.5'
+gem 'opentelemetry-api', '~> 1.3.0'
group :opentelemetry do
gem 'opentelemetry-exporter-otlp', '~> 0.28.0', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 4fddbded46..31e317e819 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -289,7 +289,7 @@ GEM
ruby-progressbar (~> 1.4)
globalid (1.2.1)
activesupport (>= 6.1)
- google-protobuf (3.25.3)
+ google-protobuf (3.25.4)
googleapis-common-protos-types (1.14.0)
google-protobuf (~> 3.18)
haml (6.3.0)
@@ -492,10 +492,10 @@ GEM
openssl (3.2.0)
openssl-signature_algorithm (1.3.0)
openssl (> 2.0)
- opentelemetry-api (1.2.5)
+ opentelemetry-api (1.3.0)
opentelemetry-common (0.20.1)
opentelemetry-api (~> 1.0)
- opentelemetry-exporter-otlp (0.28.0)
+ opentelemetry-exporter-otlp (0.28.1)
google-protobuf (>= 3.18)
googleapis-common-protos-types (~> 1.3)
opentelemetry-api (~> 1.1)
@@ -512,14 +512,14 @@ GEM
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-rack (~> 0.21)
- opentelemetry-instrumentation-action_view (0.7.0)
+ opentelemetry-instrumentation-action_view (0.7.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-active_support (~> 0.1)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_job (0.7.3)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-active_model_serializers (0.20.1)
+ opentelemetry-instrumentation-active_model_serializers (0.20.2)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-instrumentation-active_record (0.7.2)
@@ -531,32 +531,32 @@ GEM
opentelemetry-instrumentation-base (0.22.3)
opentelemetry-api (~> 1.0)
opentelemetry-registry (~> 0.1)
- opentelemetry-instrumentation-concurrent_ruby (0.21.3)
+ opentelemetry-instrumentation-concurrent_ruby (0.21.4)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-excon (0.22.3)
+ opentelemetry-instrumentation-excon (0.22.4)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-faraday (0.24.5)
+ opentelemetry-instrumentation-faraday (0.24.6)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-http (0.23.3)
+ opentelemetry-instrumentation-http (0.23.4)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-http_client (0.22.6)
+ opentelemetry-instrumentation-http_client (0.22.7)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-net_http (0.22.6)
+ opentelemetry-instrumentation-net_http (0.22.7)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-pg (0.27.3)
+ opentelemetry-instrumentation-pg (0.27.4)
opentelemetry-api (~> 1.0)
opentelemetry-helpers-sql-obfuscation
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-rack (0.24.5)
+ opentelemetry-instrumentation-rack (0.24.6)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-rails (0.31.0)
+ opentelemetry-instrumentation-rails (0.31.1)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-action_mailer (~> 0.1.0)
opentelemetry-instrumentation-action_pack (~> 0.9.0)
@@ -565,20 +565,20 @@ GEM
opentelemetry-instrumentation-active_record (~> 0.7.0)
opentelemetry-instrumentation-active_support (~> 0.6.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-redis (0.25.6)
+ opentelemetry-instrumentation-redis (0.25.7)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
- opentelemetry-instrumentation-sidekiq (0.25.6)
+ opentelemetry-instrumentation-sidekiq (0.25.7)
opentelemetry-api (~> 1.0)
opentelemetry-instrumentation-base (~> 0.22.1)
opentelemetry-registry (0.3.1)
opentelemetry-api (~> 1.1)
- opentelemetry-sdk (1.4.1)
+ opentelemetry-sdk (1.5.0)
opentelemetry-api (~> 1.1)
opentelemetry-common (~> 0.20)
opentelemetry-registry (~> 0.2)
opentelemetry-semantic_conventions
- opentelemetry-semantic_conventions (1.10.0)
+ opentelemetry-semantic_conventions (1.10.1)
opentelemetry-api (~> 1.0)
orm_adapter (0.5.0)
ox (2.14.18)
@@ -983,7 +983,7 @@ DEPENDENCIES
omniauth-rails_csrf_protection (~> 1.0)
omniauth-saml (~> 2.0)
omniauth_openid_connect (~> 0.6.1)
- opentelemetry-api (~> 1.2.5)
+ opentelemetry-api (~> 1.3.0)
opentelemetry-exporter-otlp (~> 0.28.0)
opentelemetry-instrumentation-active_job (~> 0.7.1)
opentelemetry-instrumentation-active_model_serializers (~> 0.20.1)
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 6143c6e1ca..47214bb383 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -443,6 +443,8 @@
"mute_modal.title": "Mute user?",
"mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
"mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
+ "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
+ "name_and_others_with_link": "{name} and {count, plural, one {# other} other {# others}}",
"navigation_bar.about": "About",
"navigation_bar.advanced_interface": "Open in advanced web interface",
"navigation_bar.blocks": "Blocked users",
@@ -470,6 +472,10 @@
"navigation_bar.security": "Security",
"not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
"notification.admin.report": "{name} reported {target}",
+ "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
+ "notification.admin.report_account_other": "{name} reported {count, plural, one {one post} other {# posts}} from {target}",
+ "notification.admin.report_statuses": "{name} reported {target} for {category}",
+ "notification.admin.report_statuses_other": "{name} reported {target}",
"notification.admin.sign_up": "{name} signed up",
"notification.favourite": "{name} favourited your post",
"notification.follow": "{name} followed you",
@@ -485,6 +491,8 @@
"notification.moderation_warning.action_silence": "Your account has been limited.",
"notification.moderation_warning.action_suspend": "Your account has been suspended.",
"notification.own_poll": "Your poll has ended",
+ "notification.poll": "A poll you voted in has ended",
+ "notification.private_mention": "{name} privately mentioned you",
"notification.reblog": "{name} boosted your status",
"notification.relationships_severance_event": "Lost connections with {name}",
"notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -502,6 +510,8 @@
"notifications.column_settings.admin.report": "New reports:",
"notifications.column_settings.admin.sign_up": "New sign-ups:",
"notifications.column_settings.alert": "Desktop notifications",
+ "notifications.column_settings.beta.category": "Experimental features",
+ "notifications.column_settings.beta.grouping": "Group notifications",
"notifications.column_settings.favourite": "Favourites:",
"notifications.column_settings.filter_bar.advanced": "Display all categories",
"notifications.column_settings.filter_bar.category": "Quick filter bar",
@@ -665,9 +675,13 @@
"report.unfollow_explanation": "You are following this account. To not see their posts in your home feed anymore, unfollow them.",
"report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} posts}} attached",
"report_notification.categories.legal": "Legal",
+ "report_notification.categories.legal_sentence": "illegal content",
"report_notification.categories.other": "Other",
+ "report_notification.categories.other_sentence": "other",
"report_notification.categories.spam": "Spam",
+ "report_notification.categories.spam_sentence": "spam",
"report_notification.categories.violation": "Rule violation",
+ "report_notification.categories.violation_sentence": "rule violation",
"report_notification.open": "Open report",
"search.no_recent_searches": "No recent searches",
"search.placeholder": "Search",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index dd3d448834..b44bc6c5d8 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -474,7 +474,7 @@
"notification.admin.report": "{name} hevur meldað {target}",
"notification.admin.report_account": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target} fyri {category}",
"notification.admin.report_account_other": "{name} meldaði {count, plural, one {ein post} other {# postar}} frá {target}",
- "notification.admin.report_statuses": "{name} melaði {target} fyri {category}",
+ "notification.admin.report_statuses": "{name} meldaði {target} fyri {category}",
"notification.admin.report_statuses_other": "{name} meldaði {target}",
"notification.admin.sign_up": "{name} meldaði seg til",
"notification.favourite": "{name} dámdi postin hjá tær",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index e3b3a96568..49b8931d50 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -35,7 +35,9 @@
"account.follow_back": "Weromfolgje",
"account.followers": "Folgers",
"account.followers.empty": "Noch net ien folget dizze brûker.",
+ "account.followers_counter": "{count, plural, one {{counter} folger} other {{counter} folgers}}",
"account.following": "Folgjend",
+ "account.following_counter": "{count, plural, one {{counter} folgjend} other {{counter} folgjend}}",
"account.follows.empty": "Dizze brûker folget noch net ien.",
"account.go_to_profile": "Gean nei profyl",
"account.hide_reblogs": "Boosts fan @{name} ferstopje",
@@ -61,6 +63,7 @@
"account.requested_follow": "{name} hat dy in folchfersyk stjoerd",
"account.share": "Profyl fan @{name} diele",
"account.show_reblogs": "Boosts fan @{name} toane",
+ "account.statuses_counter": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}",
"account.unblock": "@{name} deblokkearje",
"account.unblock_domain": "Domein {domain} deblokkearje",
"account.unblock_short": "Deblokkearje",
@@ -224,6 +227,7 @@
"domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
"domain_pill.who_they_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t ien hjit en op hokker server dy sit, kinne jo mei minsken op it troch sosjale web (fediverse) kommunisearje.",
"domain_pill.your_handle": "Jo fediverse-adres:",
+ "domain_pill.your_username": "Jo unike identifikaasje-adres op dizze server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
"embed.instructions": "Embed this status on your website by copying the code below.",
"embed.preview": "Sa komt it der út te sjen:",
"emoji_button.activity": "Aktiviteiten",
@@ -290,6 +294,8 @@
"filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
"filter_modal.select_filter.title": "Dit berjocht filterje",
"filter_modal.title.status": "In berjocht filterje",
+ "filtered_notifications_banner.mentions": "{count, plural, one {fermelding} other {fermeldingen}}",
+ "filtered_notifications_banner.pending_requests": "Meldingen fan {count, plural, =0 {net ien} one {ien persoan} other {# minsken}} dy’t jo miskien kenne",
"filtered_notifications_banner.title": "Filtere meldingen",
"firehose.all": "Alles",
"firehose.local": "Dizze server",
@@ -299,6 +305,8 @@
"follow_requests.unlocked_explanation": "Ek al is jo account net besletten, de meiwurkers fan {domain} tinke dat jo miskien de folgjende folchfersiken hânmjittich kontrolearje.",
"follow_suggestions.curated_suggestion": "Spesjaal selektearre",
"follow_suggestions.dismiss": "Net mear werjaan",
+ "follow_suggestions.featured_longer": "Hânmjittich selektearre troch it team fan {domain}",
+ "follow_suggestions.friends_of_friends_longer": "Populêr ûnder minsken dy’t jo folgje",
"follow_suggestions.hints.featured": "Dit profyl is hânmjittich troch it {domain}-team selektearre.",
"follow_suggestions.hints.friends_of_friends": "Dit profyl is populêr ûnder de minsken dy’t jo folgje.",
"follow_suggestions.hints.most_followed": "Dit profyl is ien fan de meast folge op {domain}.",
@@ -306,6 +314,8 @@
"follow_suggestions.hints.similar_to_recently_followed": "Dit profyl is hast lyk oan de profilen dy’t jo koartlyn folge hawwe.",
"follow_suggestions.personalized_suggestion": "Personalisearre suggestje",
"follow_suggestions.popular_suggestion": "Populêre suggestje",
+ "follow_suggestions.popular_suggestion_longer": "Populêr op {domain}",
+ "follow_suggestions.similar_to_recently_followed_longer": "Fergelykber mei accounts dy’t jo sûnt koart folgje",
"follow_suggestions.view_all": "Alles werjaan",
"follow_suggestions.who_to_follow": "Wa te folgjen",
"followed_tags": "Folge hashtags",
@@ -401,6 +411,8 @@
"limited_account_hint.action": "Profyl dochs besjen",
"limited_account_hint.title": "Dit profyl is troch de behearders fan {domain} ferstoppe.",
"link_preview.author": "Troch {name}",
+ "link_preview.more_from_author": "Mear fan {name}",
+ "link_preview.shares": "{count, plural, one {{counter} berjocht} other {{counter} berjochten}}",
"lists.account.add": "Oan list tafoegje",
"lists.account.remove": "Ut list fuortsmite",
"lists.delete": "List fuortsmite",
@@ -419,10 +431,17 @@
"loading_indicator.label": "Lade…",
"media_gallery.toggle_visible": "{number, plural, one {ôfbylding ferstopje} other {ôfbyldingen ferstopje}}",
"moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
+ "mute_modal.hide_from_notifications": "Meldingen ferstopje",
"mute_modal.hide_options": "Opsjes ferstopje",
"mute_modal.indefinite": "Oant ik se net mear negearje",
"mute_modal.show_options": "Opsjes toane",
+ "mute_modal.they_can_mention_and_follow": "De persoan kin jo fermelde en folgje, mar jo sjogge neat mear fan dizze persoan.",
+ "mute_modal.they_wont_know": "Se krije net te witten dat se negearre wurde.",
"mute_modal.title": "Brûker negearje?",
+ "mute_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
+ "mute_modal.you_wont_see_posts": "De persoan kin jo berjochten noch hieltyd sjen, mar jo sjogge harren berjochten net mear.",
+ "name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}}",
+ "name_and_others_with_link": "{name} en {count, plural, one {# oar} other {# oaren}}",
"navigation_bar.about": "Oer",
"navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
"navigation_bar.blocks": "Blokkearre brûkers",
@@ -450,13 +469,31 @@
"navigation_bar.security": "Befeiliging",
"not_signed_in_indicator.not_signed_in": "Jo moatte oanmelde om tagong ta dizze ynformaasje te krijen.",
"notification.admin.report": "{name} hat {target} rapportearre",
+ "notification.admin.report_account": "{name} rapportearre {count, plural, one {in berjocht} other {# berjochten}} fan {target} foar {category}",
+ "notification.admin.report_account_other": "{name} rapportearre {count, plural, one {in berjocht} other {# berjochten}} fan {target}",
+ "notification.admin.report_statuses": "{name} rapportearre {target} foar {category}",
+ "notification.admin.report_statuses_other": "{name} hat {target} rapportearre",
"notification.admin.sign_up": "{name} hat harren registrearre",
"notification.favourite": "{name} hat jo berjocht as favoryt markearre",
"notification.follow": "{name} folget dy",
"notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
"notification.mention": "{name} hat dy fermeld",
+ "notification.moderation-warning.learn_more": "Mear ynfo",
+ "notification.moderation_warning": "Jo hawwe in moderaasje-warskôging ûntfongen",
+ "notification.moderation_warning.action_delete_statuses": "Guon fan jo berjochten binne fuortsmiten.",
+ "notification.moderation_warning.action_disable": "Jo account is útskeakele.",
+ "notification.moderation_warning.action_mark_statuses_as_sensitive": "Guon fan jo berjochten binne as gefoelich markearre.",
+ "notification.moderation_warning.action_none": "Jo account hat in moderaasje-warskôging ûntfongen.",
+ "notification.moderation_warning.action_sensitive": "Jo berjochten wurde fan no ôf as gefoelich markearre.",
+ "notification.moderation_warning.action_silence": "Jo account is beheind.",
+ "notification.moderation_warning.action_suspend": "Jo account is útsteld.",
"notification.own_poll": "Jo poll is beëinige",
+ "notification.poll": "In enkête dêr’t jo oan meidien hawwe is beëinige",
+ "notification.private_mention": "{name} hat jo in priveeberjocht stjoerd",
"notification.reblog": "{name} hat jo berjocht boost",
+ "notification.relationships_severance_event": "Ferlerne ferbiningen mei {name}",
+ "notification.relationships_severance_event.account_suspension": "In behearder fan {from} hat {target} útsteld, wat betsjut dat jo gjin updates mear fan harren ûntfange kinne of mei harren kommunisearje kinne.",
+ "notification.relationships_severance_event.domain_block": "In behearder fan {from} hat {target} blokkearre, ynklusyf {followersCount} fan jo folgers en {followingCount, plural, one {# account} other {# accounts}} dy’t jo folgje.",
"notification.relationships_severance_event.learn_more": "Mear ynfo",
"notification.status": "{name} hat in berjocht pleatst",
"notification.update": "{name} hat in berjocht bewurke",
@@ -623,8 +660,11 @@
"report_notification.attached_statuses": "{count, plural, one {{count} berjocht} other {{count} berjochten}} tafoege",
"report_notification.categories.legal": "Juridysk",
"report_notification.categories.other": "Oars",
+ "report_notification.categories.other_sentence": "oars",
"report_notification.categories.spam": "Spam",
+ "report_notification.categories.spam_sentence": "spam",
"report_notification.categories.violation": "Skeinde regels",
+ "report_notification.categories.violation_sentence": "skeinde regels",
"report_notification.open": "Rapport iepenje",
"search.no_recent_searches": "Gjin resinte sykopdrachten",
"search.placeholder": "Sykje",
@@ -669,9 +709,11 @@
"status.direct": "Privee fermelde @{name}",
"status.direct_indicator": "Priveefermelding",
"status.edit": "Bewurkje",
+ "status.edited": "Lêst bywurke op {date}",
"status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
"status.embed": "Ynslute",
"status.favourite": "Favoryt",
+ "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
"status.filter": "Dit berjocht filterje",
"status.filtered": "Filtere",
"status.hide": "Berjocht ferstopje",
@@ -692,6 +734,7 @@
"status.reblog": "Booste",
"status.reblog_private": "Boost nei oarspronklike ûntfangers",
"status.reblogged_by": "{name} hat boost",
+ "status.reblogs": "{count, plural, one {boost} other {boosts}}",
"status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
"status.redraft": "Fuortsmite en opnij opstelle",
"status.remove_bookmark": "Blêdwizer fuortsmite",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 93268c2715..f5488cfce4 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -523,7 +523,7 @@
"notifications.policy.filter_not_following_title": "Daoine nach eil thu a’ leantainn",
"notifications.policy.filter_private_mentions_hint": "Criathraichte ach ma tha e a’ freagairt do dh’iomradh agad fhèin no ma tha thu a’ leantainn an t-seòladair",
"notifications.policy.filter_private_mentions_title": "Iomraidhean prìobhaideach o choigrich",
- "notifications.policy.title": "Falamhaich na brathan o…",
+ "notifications.policy.title": "Falaich na brathan o…",
"notifications_permission_banner.enable": "Cuir brathan deasga an comas",
"notifications_permission_banner.how_to_control": "Airson brathan fhaighinn nuair nach eil Mastodon fosgailte, cuir na brathan deasga an comas. Tha an smachd agad fhèin air dè na seòrsaichean de chonaltradh a ghineas brathan deasga leis a’ phutan {icon} gu h-àrd nuair a bhios iad air an cur an comas.",
"notifications_permission_banner.title": "Na caill dad gu bràth tuilleadh",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index db1ead30c8..22f9ec7dd5 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -443,6 +443,8 @@
"mute_modal.title": "Silentiar le usator?",
"mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
"mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
+ "name_and_others": "{name} e {count, plural, one {# altere} other {# alteres}}",
+ "name_and_others_with_link": "{name} e {count, plural, one {# altere} other {# alteres}}",
"navigation_bar.about": "A proposito",
"navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
"navigation_bar.blocks": "Usatores blocate",
@@ -502,6 +504,8 @@
"notifications.column_settings.admin.report": "Nove reportos:",
"notifications.column_settings.admin.sign_up": "Nove inscriptiones:",
"notifications.column_settings.alert": "Notificationes de scriptorio",
+ "notifications.column_settings.beta.category": "Functionalitates experimental",
+ "notifications.column_settings.beta.grouping": "Notificationes de gruppo",
"notifications.column_settings.favourite": "Favorites:",
"notifications.column_settings.filter_bar.advanced": "Monstrar tote le categorias",
"notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index f8a2995c57..6899274f3e 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -695,7 +695,7 @@
"sign_in_banner.create_account": "Sukurti paskyrą",
"sign_in_banner.follow_anyone": "Sek bet kurį asmenį visoje fediverse ir žiūrėk viską chronologine tvarka. Jokių algoritmų, reklamų ar paspaudimų.",
"sign_in_banner.mastodon_is": "„Mastodon“ – tai geriausias būdas sekti, kas vyksta.",
- "sign_in_banner.sign_in": "Prisijungimas",
+ "sign_in_banner.sign_in": "Prisijungti",
"sign_in_banner.sso_redirect": "Prisijungti arba užsiregistruoti",
"status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
"status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index a0359fd868..d492602d22 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -443,6 +443,8 @@
"mute_modal.title": "Silenciar utilizador?",
"mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
"mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
+ "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
+ "name_and_others_with_link": "{name} e {count, plural, one {# outro} other {# outros}}",
"navigation_bar.about": "Sobre",
"navigation_bar.advanced_interface": "Abrir na interface web avançada",
"navigation_bar.blocks": "Utilizadores bloqueados",
@@ -470,6 +472,10 @@
"navigation_bar.security": "Segurança",
"not_signed_in_indicator.not_signed_in": "Necessita de iniciar sessão para utilizar esta funcionalidade.",
"notification.admin.report": "{name} denunciou {target}",
+ "notification.admin.report_account": "{name} denunciou {count, plural, one {uma publicação} other {# publicações}} de {target} por {category}",
+ "notification.admin.report_account_other": "{name} denunciou {count, plural, one {uma publicação} other {# publicações}} de {target}",
+ "notification.admin.report_statuses": "{name} denunicou {target} por {category}",
+ "notification.admin.report_statuses_other": "{name} denunciou {target}",
"notification.admin.sign_up": "{name} inscreveu-se",
"notification.favourite": "{name} assinalou a sua publicação como favorita",
"notification.follow": "{name} começou a seguir-te",
@@ -485,6 +491,8 @@
"notification.moderation_warning.action_silence": "A sua conta foi limitada.",
"notification.moderation_warning.action_suspend": "A sua conta foi suspensa.",
"notification.own_poll": "A sua votação terminou",
+ "notification.poll": "Uma votação em que participaste chegou ao fim",
+ "notification.private_mention": "{name} mencionou-o em privado",
"notification.reblog": "{name} reforçou a tua publicação",
"notification.relationships_severance_event": "Perdeu as ligações com {name}",
"notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que já não pode receber atualizações dele ou interagir com ele.",
@@ -502,6 +510,8 @@
"notifications.column_settings.admin.report": "Novas denúncias:",
"notifications.column_settings.admin.sign_up": "Novas inscrições:",
"notifications.column_settings.alert": "Notificações no ambiente de trabalho",
+ "notifications.column_settings.beta.category": "Funcionalidades experimentais",
+ "notifications.column_settings.beta.grouping": "Agrupar notificações",
"notifications.column_settings.favourite": "Favoritos:",
"notifications.column_settings.filter_bar.advanced": "Mostrar todas as categorias",
"notifications.column_settings.filter_bar.category": "Barra de filtros rápidos",
@@ -665,9 +675,13 @@
"report.unfollow_explanation": "Está a seguir esta conta. Para não voltar a ver as publicações desta conta na sua página inicial, deixe de a seguir.",
"report_notification.attached_statuses": "{count, plural,one {{count} publicação} other {{count} publicações}} em anexo",
"report_notification.categories.legal": "Legal",
+ "report_notification.categories.legal_sentence": "conteúdo ilegal",
"report_notification.categories.other": "Outro",
+ "report_notification.categories.other_sentence": "outro",
"report_notification.categories.spam": "Spam",
+ "report_notification.categories.spam_sentence": "spam",
"report_notification.categories.violation": "Violação de regra",
+ "report_notification.categories.violation_sentence": "violação de regra",
"report_notification.open": "Abrir denúncia",
"search.no_recent_searches": "Nenhuma pesquisa recente",
"search.placeholder": "Pesquisar",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index ab8179863c..3591d07d12 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -443,7 +443,8 @@
"mute_modal.title": "ซ่อนผู้ใช้?",
"mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
"mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
- "name_and_others": "{name} และ {count, plural, one {# อื่น ๆ } other {# อื่น ๆ}}",
+ "name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}}",
+ "name_and_others_with_link": "{name} และ {count, plural, other {# อื่น ๆ}}",
"navigation_bar.about": "เกี่ยวกับ",
"navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
"navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
@@ -471,7 +472,10 @@
"navigation_bar.security": "ความปลอดภัย",
"not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเข้าถึงทรัพยากรนี้",
"notification.admin.report": "{name} ได้รายงาน {target}",
- "notification.admin.report_statuses_other": "{name} รายงาน {target}",
+ "notification.admin.report_account": "{name} ได้รายงาน {count, plural, other {# โพสต์}}จาก {target} สำหรับ {category}",
+ "notification.admin.report_account_other": "{name} ได้รายงาน {count, plural, other {# โพสต์}}จาก {target}",
+ "notification.admin.report_statuses": "{name} ได้รายงาน {target} สำหรับ {category}",
+ "notification.admin.report_statuses_other": "{name} ได้รายงาน {target}",
"notification.admin.sign_up": "{name} ได้ลงทะเบียน",
"notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
"notification.follow": "{name} ได้ติดตามคุณ",
@@ -487,7 +491,8 @@
"notification.moderation_warning.action_silence": "จำกัดบัญชีของคุณแล้ว",
"notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
"notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
- "notification.poll": "โพลที่คุณโหวตได้จบลงแล้ว",
+ "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
+ "notification.private_mention": "{name} ได้กล่าวถึงคุณแบบส่วนตัว",
"notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
"notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
"notification.relationships_severance_event.account_suspension": "ผู้ดูแลจาก {from} ได้ระงับ {target} ซึ่งหมายความว่าคุณจะไม่สามารถรับการอัปเดตจากเขาหรือโต้ตอบกับเขาได้อีกต่อไป",
@@ -505,6 +510,8 @@
"notifications.column_settings.admin.report": "รายงานใหม่:",
"notifications.column_settings.admin.sign_up": "การลงทะเบียนใหม่:",
"notifications.column_settings.alert": "การแจ้งเตือนบนเดสก์ท็อป",
+ "notifications.column_settings.beta.category": "คุณลักษณะการทดลอง",
+ "notifications.column_settings.beta.grouping": "การแจ้งเตือนกลุ่ม",
"notifications.column_settings.favourite": "รายการโปรด:",
"notifications.column_settings.filter_bar.advanced": "แสดงหมวดหมู่ทั้งหมด",
"notifications.column_settings.filter_bar.category": "แถบตัวกรองด่วน",
@@ -668,12 +675,13 @@
"report.unfollow_explanation": "คุณกำลังติดตามบัญชีนี้ เพื่อไม่ให้เห็นโพสต์ของเขาในฟีดหน้าแรกของคุณอีกต่อไป ให้เลิกติดตามเขา",
"report_notification.attached_statuses": "{count, plural, other {{count} โพสต์}}ที่แนบมา",
"report_notification.categories.legal": "กฎหมาย",
+ "report_notification.categories.legal_sentence": "เนื้อหาที่ผิดกฎหมาย",
"report_notification.categories.other": "อื่น ๆ",
"report_notification.categories.other_sentence": "อื่น ๆ",
"report_notification.categories.spam": "สแปม",
"report_notification.categories.spam_sentence": "สแปม",
"report_notification.categories.violation": "การละเมิดกฎ",
- "report_notification.categories.violation_sentence": "ละเมิดกฎ",
+ "report_notification.categories.violation_sentence": "การละเมิดกฎ",
"report_notification.open": "รายงานที่เปิด",
"search.no_recent_searches": "ไม่มีการค้นหาล่าสุด",
"search.placeholder": "ค้นหา",
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 8b77b2a03b..f1605f0347 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -138,31 +138,51 @@ class Notification < ApplicationRecord
end
end
+ def paginate_groups(limit, pagination_order)
+ raise ArgumentError unless %i(asc desc).include?(pagination_order)
+
+ query = reorder(id: pagination_order)
+
+ unscoped
+ .with_recursive(
+ grouped_notifications: [
+ # Base case: fetching one notification and annotating it with visited groups
+ query
+ .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
+ .limit(1),
+ # Recursive case, always yielding at most one annotated notification
+ unscoped
+ .from(
+ [
+ # Expose the working table as `wt`, but quit early if we've reached the limit
+ unscoped
+ .select('id', 'groups')
+ .from('grouped_notifications')
+ .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
+ .arel.as('wt'),
+ # Recursive query, using `LATERAL` so we can refer to `wt`
+ query
+ .where(pagination_order == :desc ? 'notifications.id < wt.id' : 'notifications.id > wt.id')
+ .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(wt.groups)")
+ .limit(1)
+ .arel.lateral('notifications'),
+ ]
+ )
+ .select('notifications.*', "array_append(wt.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))"),
+ ]
+ )
+ .from('grouped_notifications AS notifications')
+ .order(id: pagination_order)
+ .limit(limit)
+ end
+
# This returns notifications from the request page, but with at most one notification per group.
# Notifications that have no `group_key` each count as a separate group.
def paginate_groups_by_max_id(limit, max_id: nil, since_id: nil)
query = reorder(id: :desc)
query = query.where(id: ...max_id) if max_id.present?
query = query.where(id: (since_id + 1)...) if since_id.present?
-
- unscoped
- .with_recursive(
- grouped_notifications: [
- query
- .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
- .limit(1),
- query
- .joins('CROSS JOIN grouped_notifications')
- .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
- .where('notifications.id < grouped_notifications.id')
- .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
- .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
- .limit(1),
- ]
- )
- .from('grouped_notifications AS notifications')
- .order(id: :desc)
- .limit(limit)
+ query.paginate_groups(limit, :desc)
end
# Differs from :paginate_groups_by_max_id in that it gives the results immediately following min_id,
@@ -172,25 +192,7 @@ class Notification < ApplicationRecord
query = reorder(id: :asc)
query = query.where(id: (min_id + 1)...) if min_id.present?
query = query.where(id: ...max_id) if max_id.present?
-
- unscoped
- .with_recursive(
- grouped_notifications: [
- query
- .select('notifications.*', "ARRAY[COALESCE(notifications.group_key, 'ungrouped-' || notifications.id)] AS groups")
- .limit(1),
- query
- .joins('CROSS JOIN grouped_notifications')
- .where('array_length(grouped_notifications.groups, 1) < :limit', limit: limit)
- .where('notifications.id > grouped_notifications.id')
- .where.not("COALESCE(notifications.group_key, 'ungrouped-' || notifications.id) = ANY(grouped_notifications.groups)")
- .select('notifications.*', "array_append(grouped_notifications.groups, COALESCE(notifications.group_key, 'ungrouped-' || notifications.id))")
- .limit(1),
- ]
- )
- .from('grouped_notifications AS notifications')
- .order(id: :asc)
- .limit(limit)
+ query.paginate_groups(limit, :asc)
end
def to_a_grouped_paginated_by_id(limit, options = {})
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4d0e2ab389..321afb4dcb 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -471,6 +471,9 @@ ca:
title: Recomanacions de comptes a seguir
unsuppress: Restaurar les recomanacions de seguiment
instances:
+ audit_log:
+ title: Registres recents d'auditoria
+ view_all: Mostra els registres d'auditoria complets
availability:
description_html:
one: Si la tramesa cap el domini falla %{count} dia sense èxit, no es faran més intents d'entrega a no ser que es rebi una tramesa des de el domini.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 75da9a0b36..e699d9e8ad 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -471,6 +471,9 @@ da:
title: Følg-anbefalinger
unsuppress: Genopret følg-anbefaling
instances:
+ audit_log:
+ title: Seneste Revisionslogger
+ view_all: Vis alle revisionslogger
availability:
description_html:
one: Lykkes det ikke at levere til domænet i løbet af %{count} dag, foretages ingen yderligere leveringsforsøg, medmindre en levering fra domænet modtages.
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 81b7cd172d..33df545385 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,7 +1,7 @@
---
de:
about:
- about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen – dafür dezentral und mit Anstand! Beherrsche deine Daten mit Mastodon!'
+ about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen – dafür dezentral und mit Anstand! Behalte mit Mastodon die Kontrolle über deine Daten!'
contact_missing: Nicht festgelegt
contact_unavailable: Nicht verfügbar
hosted_on: Mastodon, gehostet auf %{domain}
@@ -293,7 +293,7 @@ de:
empty: Protokolle nicht gefunden.
filter_by_action: Nach Aktion filtern
filter_by_user: Nach Benutzer*in filtern
- title: Protokoll
+ title: Audit-Log
unavailable_instance: "(Server nicht verfügbar)"
announcements:
destroyed_msg: Ankündigung erfolgreich gelöscht!
@@ -471,6 +471,9 @@ de:
title: Folgeempfehlungen
unsuppress: Folgeempfehlung nicht mehr unterbinden
instances:
+ audit_log:
+ title: Neueste Audit-Logs
+ view_all: Alle Audit-Logs anzeigen
availability:
description_html:
one: Wenn die Zustellung an die Domain %{count} Tag lang erfolglos bleibt, werden keine weiteren Zustellversuche unternommen, bis eine Zustellung von der Domain empfangen wird.
@@ -588,7 +591,7 @@ de:
notes:
one: "%{count} Notiz"
other: "%{count} Notizen"
- action_log: Protokoll
+ action_log: Audit-Log
action_taken_by: Maßnahme ergriffen von
actions:
delete_description_html: Der gemeldete Beitrag wird gelöscht und die ergriffene Maßnahme wird aufgezeichnet, um dir bei zukünftigen Verstößen des gleichen Kontos zu helfen.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index fecdab4c7d..a7e6ed7a66 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -471,6 +471,9 @@ en-GB:
title: Follow recommendations
unsuppress: Restore follow recommendation
instances:
+ audit_log:
+ title: Recent Audit Logs
+ view_all: View full audit logs
availability:
description_html:
one: If delivering to the domain fails %{count} day without succeeding, no further delivery attempts will be made unless a delivery from the domain is received.
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 5add90ae62..35dc9a348d 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -471,6 +471,9 @@ es-AR:
title: Recom. de cuentas a seguir
unsuppress: Restablecer recomendaciones de cuentas para seguir
instances:
+ audit_log:
+ title: Registros de auditoría recientes
+ view_all: Ver registros de auditoría completos
availability:
description_html:
one: Si el envío al dominio falla durante %{count} día sin éxito, no se harán más intentos de entrega a menos que se reciba un envío desde el dominio.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index c93c5edc0e..25604d6a1c 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -293,7 +293,7 @@ fi:
empty: Lokeja ei löytynyt.
filter_by_action: Suodata tapahtuman mukaan
filter_by_user: Suodata käyttäjän mukaan
- title: Auditointiloki
+ title: Tarkastusloki
unavailable_instance: "(verkkotunnus ei saatavilla)"
announcements:
destroyed_msg: Tiedote poistettu onnistuneesti!
@@ -471,6 +471,9 @@ fi:
title: Seuraamissuositukset
unsuppress: Palauta seuraamissuositus
instances:
+ audit_log:
+ title: Viimeaikaiset tarkastuslokit
+ view_all: Näytä kaikki tarkastuslokit
availability:
description_html:
one: Jos toimitus verkkotunnukseen epäonnistuu %{count} päivä ilman onnistumista, uusia yrityksiä ei tehdä ennen kuin toimitus alkaen verkkotunnukselta on vastaanotettu.
@@ -693,7 +696,7 @@ fi:
administrator: Ylläpitäjä
administrator_description: Käyttäjät, joilla on tämä käyttöoikeus, ohittavat jokaisen käyttöoikeuden
delete_user_data: Poistaa käyttäjän tiedot
- delete_user_data_description: Salli käyttäjien poistaa muiden käyttäjien tiedot viipymättä
+ delete_user_data_description: Sallii käyttäjien poistaa muiden käyttäjien tiedot viipymättä
invite_users: Kutsua käyttäjiä
invite_users_description: Sallii käyttäjien kutsua uusia ihmisiä palvelimelle
manage_announcements: Hallita tiedotteita
@@ -724,7 +727,7 @@ fi:
manage_users_description: Sallii käyttäjien tarkastella muiden käyttäjien tietoja ja suorittaa valvontatoimia heitä kohtaan
manage_webhooks: Hallita webhookeja
manage_webhooks_description: Sallii käyttäjien luoda webhookeja hallinnollisiin tapahtumiin
- view_audit_log: Katsoa valvontalokia
+ view_audit_log: Katsoa tarkastuslokia
view_audit_log_description: Sallii käyttäjien nähdä palvelimen hallinnollisten toimien historian
view_dashboard: Katsoa koontinäyttöä
view_dashboard_description: Sallii käyttäjien käyttää kojelautaa ja erilaisia mittareita
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 6a5401ced4..b483a321a9 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -471,6 +471,9 @@ fo:
title: Tilmæli at fylgja
unsuppress: Endurskapa tilmæli at fylgja
instances:
+ audit_log:
+ title: Feskir kanningarloggar
+ view_all: Vís fullar kanningarloggar
availability:
description_html:
one: Um veiting til navnaøkið ikki riggar í %{count} dag, so verða ongar royndir at veita gjørdar, uttan so, at ein veiting frá navnaøkinum er móttikin.
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 54e28608ef..054ae2fab2 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -226,6 +226,7 @@ fy:
update_custom_emoji: Lokale emoji bywurkje
update_domain_block: Domeinblokkade bywurkje
update_ip_block: IP-rigel bywurkje
+ update_report: Rapportaazje bywurkje
update_status: Berjocht bywurkje
update_user_role: Rol bywurkje
actions:
@@ -293,6 +294,7 @@ fy:
filter_by_action: Op aksje filterje
filter_by_user: Op brûker filterje
title: Auditlogboek
+ unavailable_instance: "(domeinnamme net beskikber)"
announcements:
destroyed_msg: Fuortsmiten fan meidieling slagge!
edit:
@@ -469,6 +471,9 @@ fy:
title: Oanrekommandearre accounts
unsuppress: Account wer oanrekommandearje
instances:
+ audit_log:
+ title: Resinte auditlochboeken
+ view_all: Folsleine auditlochboeken besjen
availability:
description_html:
one: As de besoarging oan it domein nei %{count} dag mislearjen bliuwt, dan sille der gjin fierdere besykjen ta besoarging dien wurde oant in besoarging fan it domein ûntfongen is.
@@ -637,6 +642,7 @@ fy:
report: 'Rapportaazje #%{id}'
reported_account: Rapportearre account
reported_by: Rapportearre troch
+ reported_with_application: Mei applikaasje rapportearre
resolved: Oplost
resolved_msg: Rapportaazje oplosse slagge!
skip_to_actions: Gean daliks nei de maatregels
@@ -780,6 +786,7 @@ fy:
approved: Goedkarring fereaske om te registrearje te kinnen
none: Net ien kin harren registrearje
open: Elkenien kin harren registrearje
+ warning_hint: Wy riede jo oan om ‘Goedkarring fereaske om registrearje te kinnen’ te brûken, útsein jo der wis fan binne dat jo moderaasjeteam spam en kweawollende registraasjes tidich ôfhannelje kin.
security:
authorized_fetch: Ferifikaasje fan fedearre servers fereaskje
authorized_fetch_hint: Ferifikaasje fereaskje fan federearre servers, makket in striktere hanthaving fan sawol brûkersnivo as server-levelblokken mooglik. Dit giet wol ten koste fan de prestaasjes, ferminderet it berik fan jo antwurden en kin kompatibiliteitsproblemen mei guon federearre services opleverje. Boppedat sil dit net foarkomme dat tawijde spilers jo iepenbiere artikelen en accounts ophelje.
@@ -950,6 +957,7 @@ fy:
delete: Fuortsmite
edit_preset: Foarynstelling foar warskôging bewurkje
empty: Jo hawwe noch gjin foarynstellingen foar warskôgingen tafoege.
+ title: Foarynstellingen foar warskôgingen
webhooks:
add_new: Einpunt tafoegje
delete: Fuortsmite
@@ -971,6 +979,9 @@ fy:
title: Webhooks
webhook: Webhook
admin_mailer:
+ auto_close_registrations:
+ body: Yn ferbân mei in gebrek oan resinte moderatoraktiviteit, is de registraasjemodus op %{instance} automatysk wizige nei hânmjittige beoardieling troch moderatoren. Dit om foar te kommen dat %{instance} as platfoarm foar eventueel misbrûk brûkt wurde kin. Jo kinne op elk winske momint werom skeakelje nei iepen registraasjes.
+ subject: De registraasjemodus op %{instance} is automatysk wizige nei hânmjittige beoardieling troch moderatoren
new_appeal:
actions:
delete_statuses: it fuortsmiten fan harren berjochten
@@ -1669,6 +1680,8 @@ fy:
user_domain_block: Jo hawwe %{target_name} blokkearre
lost_followers: Ferlerne folgers
lost_follows: Ferlerne folge accounts
+ preamble: Jo kinne folge accounts en folgers ferlieze wannear’t jo in domein blokkearje of wannear’t de moderators fan jo server beslisse om in eksterne server út te sluten. Wannear’t dat bart, kinne jo listen fan ferbrutsen folchrelaasjes downloade, dizze ynspektearje en mooglik ymportearje op in oare server.
+ purged: Ynformaasje oer dizze server is fuortsmiten troch de behearders fan jo server.
type: Barren
statuses:
attached:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 647c46d7cf..57162e2ed1 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -495,6 +495,9 @@ ga:
title: Moltaí leanúna
unsuppress: Aischuir moladh leanúna
instances:
+ audit_log:
+ title: Logchomhaid Iniúchta le Déanaí
+ view_all: Féach ar logaí iniúchta iomlána
availability:
description_html:
few: Má theipeann ar sheachadadh chuig an bhfearann ar %{count} laethanta éagsúla gan rath, ní dhéanfar aon iarrachtaí seachadta eile mura bhfaightear ó seachadadh ón bhfearann.
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d1c8633bad..45ae60008c 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -471,6 +471,9 @@ gl:
title: Recomendacións de seguimento
unsuppress: Restablecer recomendación de seguimento
instances:
+ audit_log:
+ title: Rexistros de Auditoría recentes
+ view_all: Ver os rexistros de auditoría completos
availability:
description_html:
one: Se fallan as entregas ao dominio por %{count} día, non se farán máis intentos a menos que se reciba unha solicitude desde ese dominio.
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 105bd059f2..5a9571da75 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -487,6 +487,9 @@ he:
title: המלצות מעקב
unsuppress: שחזור המלצות מעקב
instances:
+ audit_log:
+ title: יומני ביקורת אחרונים
+ view_all: צפיה ביומני הביקורת המלאים
availability:
description_html:
many: אם משלוח לדומיין נכשל במשך %{count} ימים שונים ולא מצליח, נסיונות משלוח נוספים לא יעשו אלא אם התקבל משלוח מהדומיין.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index df32bd39d1..695b3786f2 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -471,6 +471,9 @@ hu:
title: Követési ajánlatok
unsuppress: Követési ajánlatok visszaállítása
instances:
+ audit_log:
+ title: Legutóbbi auditnapló
+ view_all: Teljes auditnapló megtekintése
availability:
description_html:
one: Ha a domainre történő kézbesítés %{count} teljes nap sikertelen, további kézbesítéseket már nem kísérlünk meg, hacsak mi nem kapunk kézbesítést a domaintől.
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 7350ffceeb..101d1ecc81 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -226,6 +226,7 @@ ia:
update_custom_emoji: Actualisar emoji personalisate
update_domain_block: Actualisar blocada de dominio
update_ip_block: Actualisar le regula IP
+ update_report: Actualisar le reporto
update_status: Actualisar le message
update_user_role: Actualisar rolo
actions:
@@ -638,6 +639,7 @@ ia:
report: 'Reporto #%{id}'
reported_account: Conto reportate
reported_by: Reportate per
+ reported_with_application: Signalate con le application
resolved: Resolvite
resolved_msg: Reporto resolvite con successo!
skip_to_actions: Saltar al actiones
diff --git a/config/locales/is.yml b/config/locales/is.yml
index a4cc282d1d..b008e284dd 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -471,6 +471,9 @@ is:
title: Fylgja meðmælum
unsuppress: Endurheimta að fylgja meðmælum
instances:
+ audit_log:
+ title: Nýlegar atvikaskráningar
+ view_all: Skoða heildar-atvikaskráningar
availability:
description_html:
one: Ef afhending til lénsins mistekst í %{count} dag, verður ekki reynt aftur að afhenda til lénsins nema ef afhending frá léninu berst.
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 68e1608d9c..02c21ac312 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -471,6 +471,9 @@ it:
title: Consigli su chi seguire
unsuppress: Ripristina consigli su chi seguire
instances:
+ audit_log:
+ title: Log di Controllo Recenti
+ view_all: Visualizza tutti i log
availability:
description_html:
one: Se la consegna al dominio fallisce %{count} giorno, non sarà effettuato alcun tentativo di consegna ulteriore a meno che la consegna dal dominio non sia ricevuta.
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 5142b55032..0eeb055170 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -223,6 +223,7 @@ ja:
update_custom_emoji: カスタム絵文字を更新
update_domain_block: ドメインブロックを更新
update_ip_block: IPルールを更新
+ update_report: 通報の更新
update_status: 投稿を更新
update_user_role: ロールを更新
actions:
@@ -626,6 +627,7 @@ ja:
report: '通報 #%{id}'
reported_account: 報告対象アカウント
reported_by: 報告者
+ reported_with_application: 報告に使用されたアプリ
resolved: 解決済み
resolved_msg: 通報を解決済みにしました！
skip_to_actions: アクションに移動
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index a094936aaf..d6295ec9ae 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -810,7 +810,7 @@ kab:
video:
one: "%{count} n tbidyutt"
other: "%{count} n tbidyutin"
- edited_at_html: Tettwaẓreg %{date}
+ edited_at_html: Tettwaẓreg ass n %{date}
open_in_web: Ldi deg Web
poll:
total_people:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 632bd7c097..4a1afee842 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -465,6 +465,9 @@ ko:
title: 팔로우 추천
unsuppress: 팔로우 추천 복원
instances:
+ audit_log:
+ title: 최근 감사 기록
+ view_all: 감사 기록 전체 보기
availability:
description_html:
other: 도메인에 대한 전달이 성공 없이 %{count}일 실패한다면, 이후의 전달 시도는 해당 도메인에서 전달이 오기 전까지는 만들어지지 않습니다.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 91872754f5..b23b4e10af 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -471,6 +471,9 @@ nl:
title: Aanbevolen accounts
unsuppress: Account weer aanbevelen
instances:
+ audit_log:
+ title: Recente audit-logboeken
+ view_all: Volledige audit-logboeken inzien
availability:
description_html:
one: Wanneer de bezorging aan het domein gedurende %{count} dag blijft mislukken dan worden er geen bezorgpogingen meer gedaan, totdat een bezorging van het domein wordt ontvangen.
@@ -977,7 +980,7 @@ nl:
webhook: Webhook
admin_mailer:
auto_close_registrations:
- body: In verband met een gebrek aan recentelijke moderator-activiteit, is de registratie-modus op %{instance} automatisch veranderd naar handmatige beoordeling door moderatoren. Dit om te voorkomen dat %{instance} als platform voor eventueel misbruik kan worden gebruikt. Je kunt op elk gewenst moment veel terugschakelen naar open registraties.
+ body: In verband met een gebrek aan recentelijke moderatoractiviteit, is de registratiemodus op %{instance} automatisch gewijzigd naar handmatige beoordeling door moderatoren. Dit om te voorkomen dat %{instance} als platform voor eventueel misbruik kan worden gebruikt. Je kunt op elk gewenst moment weer terugschakelen naar open registraties.
subject: De registratie-modus op %{instance} is automatisch veranderd naar handmatige beoordeling door moderatoren
new_appeal:
actions:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b0c733102e..8a2dab5b99 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -487,6 +487,9 @@ pl:
title: Polecane konta
unsuppress: Przywróć polecenie obserwacji konta
instances:
+ audit_log:
+ title: Niedawne zdarzenia z dzienniku
+ view_all: Pokaż pełny dziennik zdarzeń
availability:
description_html:
few: Jeśli dostarczenie do domeny nie powiedzie się %{count} dni bez powodzenia, nie zostaną podjęte dalsze próby dostawy, chyba że otrzymano dostawę od domeny.
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index 1df423bb7d..b0db0709c1 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -471,6 +471,9 @@ pt-PT:
title: Seguir recomendações
unsuppress: Restaurar recomendações de contas a seguir
instances:
+ audit_log:
+ title: Registos de auditoria recentes
+ view_all: Ver registos de auditoria completos
availability:
description_html:
one: Se a transmissão ao domínio falhar ao final de %{count} dia(s), não será feita mais nenhuma tentativa de transmissão a menos que seja recebida uma transmissão proveniente desse domínio.
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index 9e0f67b707..64e5dd68da 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -211,6 +211,7 @@ fy:
setting_default_privacy: Sichtberheid fan nije berjochten
setting_default_sensitive: Media altyd as gefoelich markearje
setting_delete_modal: Freegje foar it fuortsmiten fan in berjocht in befêstiging
+ setting_disable_hover_cards: Profylfoarbylden troch der oerhinne te sweven útskeakelje
setting_disable_swiping: Feibewegingen útskeakelje
setting_display_media: Mediawerjefte
setting_display_media_default: Standert
@@ -242,11 +243,13 @@ fy:
warn: Mei in warskôging ferstopje
form_admin_settings:
activity_api_enabled: Publyklik meitsjen fan sammele statistiken oer brûkersaktiviteiten yn de API
+ app_icon: App-piktogram
backups_retention_period: Bewartermyn brûkersargyf
bootstrap_timeline_accounts: Accounts dy’t altyd oan nije brûkers oanrekommandearre wurde
closed_registrations_message: Oanpast berjocht wannear registraasje útskeakele is
content_cache_retention_period: Bewartermyn foar eksterne ynhâld
custom_css: Oanpaste CSS
+ favicon: Favicon
mascot: Oanpaste maskotte (legacy)
media_cache_retention_period: Bewartermyn mediabuffer
peers_api_enabled: Publyklik meitsjen fan ûntdekte servers yn de API
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 2d0af3001e..bee2454cf0 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -242,11 +242,13 @@ ia:
warn: Celar con un advertimento
form_admin_settings:
activity_api_enabled: Publicar statisticas aggregate re le activitate de usator in le API
+ app_icon: Icone de app
backups_retention_period: Periodo de retention del archivo de usator
bootstrap_timeline_accounts: Recommenda sempre iste contos a nove usatores
closed_registrations_message: Message personalisate quando le inscriptiones non es disponibile
content_cache_retention_period: Periodo de retention del contento remote
custom_css: CSS personalisate
+ favicon: Favicon
mascot: Personalisar le mascotte (hereditage)
media_cache_retention_period: Periodo de retention del cache multimedial
peers_api_enabled: Publicar le lista de servitores discoperite in le API
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index cdc82367f9..c72112645b 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -83,7 +83,7 @@ th:
closed_registrations_message: แสดงเมื่อมีการปิดการลงทะเบียน
content_cache_retention_period: จะลบโพสต์ทั้งหมดจากเซิร์ฟเวอร์อื่น ๆ (รวมถึงการดันและการตอบกลับ) หลังจากจำนวนวันที่ระบุ โดยไม่คำนึงถึงการโต้ตอบใด ๆ ของผู้ใช้ในเซิร์ฟเวอร์กับโพสต์เหล่านั้น สิ่งนี้รวมถึงโพสต์ที่ผู้ใช้ในเซิร์ฟเวอร์ได้ทำเครื่องหมายโพสต์ว่าเป็นที่คั่นหน้าหรือรายการโปรด การกล่าวถึงแบบส่วนตัวระหว่างผู้ใช้จากอินสแตนซ์ที่แตกต่างกันจะหายไปและไม่สามารถคืนค่าได้เช่นกัน การใช้การตั้งค่านี้มีไว้สำหรับอินสแตนซ์ที่มีวัตถุประสงค์พิเศษและทำลายความคาดหวังของผู้ใช้จำนวนมากเมื่อนำไปใช้สำหรับการใช้งานที่มีวัตถุประสงค์ทั่วไป
custom_css: คุณสามารถนำไปใช้ลักษณะที่กำหนดเองใน Mastodon รุ่นเว็บ
- favicon: WEBP, PNG, GIF หรือ JPG เขียนทับ Favicon ของ Mastodon เริ่มต้นด้วยไอคอนที่กำหนดเอง
+ favicon: WEBP, PNG, GIF หรือ JPG เขียนทับไอคอนเว็บของ Mastodon เริ่มต้นด้วยไอคอนที่กำหนดเอง
mascot: เขียนทับภาพประกอบในส่วนติดต่อเว็บขั้นสูง
media_cache_retention_period: จะแคชไฟล์สื่อจากโพสต์ที่สร้างโดยผู้ใช้ระยะไกลในเซิร์ฟเวอร์ของคุณ เมื่อตั้งเป็นค่าบวก จะลบสื่อหลังจากจำนวนวันที่ระบุ หากมีการขอข้อมูลสื่อหลังจากมีการลบสื่อ จะดาวน์โหลดสื่อใหม่ หากเนื้อหาต้นฉบับยังคงใช้งานได้ เนื่องจากข้อจำกัดเกี่ยวกับความถี่ที่บัตรตัวอย่างลิงก์สำรวจไซต์จากบุคคลที่สาม ขอแนะนำให้ตั้งค่านี้เป็นอย่างน้อย 14 วัน มิฉะนั้นจะไม่อัปเดตบัตรตัวอย่างลิงก์ตามความต้องการก่อนเวลานั้น
peers_api_enabled: รายการชื่อโดเมนที่เซิร์ฟเวอร์นี้พบในจักรวาลสหพันธ์ ไม่มีข้อมูลรวมอยู่ที่นี่เกี่ยวกับว่าคุณติดต่อกับเซิร์ฟเวอร์ที่กำหนดหรือไม่ เพียงแค่ว่าเซิร์ฟเวอร์ของคุณทราบเกี่ยวกับเซิร์ฟเวอร์ที่กำหนด มีการใช้สิ่งนี้โดยบริการที่เก็บรวบรวมสถิติในการติดต่อกับภายนอกในความหมายทั่วไป
@@ -243,11 +243,13 @@ th:
warn: ซ่อนด้วยคำเตือน
form_admin_settings:
activity_api_enabled: เผยแพร่สถิติรวมเกี่ยวกับกิจกรรมผู้ใช้ใน API
+ app_icon: ไอคอนแอป
backups_retention_period: ระยะเวลาการเก็บรักษาการเก็บถาวรผู้ใช้
bootstrap_timeline_accounts: แนะนำบัญชีเหล่านี้ให้กับผู้ใช้ใหม่เสมอ
closed_registrations_message: ข้อความที่กำหนดเองเมื่อการลงทะเบียนไม่พร้อมใช้งาน
content_cache_retention_period: ระยะเวลาการเก็บรักษาเนื้อหาระยะไกล
custom_css: CSS ที่กำหนดเอง
+ favicon: ไอคอนเว็บ
mascot: มาสคอตที่กำหนดเอง (ดั้งเดิม)
media_cache_retention_period: ระยะเวลาการเก็บรักษาแคชสื่อ
peers_api_enabled: เผยแพร่รายการเซิร์ฟเวอร์ที่ค้นพบใน API
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index c4bed80cc7..7ba5bf6570 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -470,6 +470,9 @@ sq:
title: Rekomandime ndjekjeje
unsuppress: Rikthe rekomandime ndjekjeje
instances:
+ audit_log:
+ title: Regjistra Auditimesh Së Fundi
+ view_all: Shihni regjistra të plotë auditimesh
availability:
description_html:
one: Nëse dhënia e mesazheve te përkatësia dështon për %{count} ditë pa sukses, s’do të bëhen përpjekje të tjera për dhënie, veç në u marrtë një dërgim prej përkatësisë.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index df76d97c00..678b5ab638 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -223,6 +223,7 @@ th:
update_custom_emoji: อัปเดตอีโมจิที่กำหนดเอง
update_domain_block: อัปเดตการปิดกั้นโดเมน
update_ip_block: อัปเดตกฎ IP
+ update_report: อัปเดตรายงาน
update_status: อัปเดตโพสต์
update_user_role: อัปเดตบทบาท
actions:
@@ -462,6 +463,9 @@ th:
title: คำแนะนำการติดตาม
unsuppress: คืนค่าคำแนะนำการติดตาม
instances:
+ audit_log:
+ title: รายการบันทึกการตรวจสอบล่าสุด
+ view_all: ดูรายการบันทึกการตรวจสอบแบบเต็ม
availability:
description_html:
other: หากการจัดส่งไปยังโดเมนล้มเหลวเป็นเวลา %{count} วันที่แตกต่างกัน โดยไม่สำเร็จ จะไม่ทำการพยายามจัดส่งเพิ่มเติมเว้นแต่จะได้รับการจัดส่ง จาก โดเมน
@@ -626,6 +630,7 @@ th:
report: 'รายงาน #%{id}'
reported_account: บัญชีที่ได้รับการรายงาน
reported_by: รายงานโดย
+ reported_with_application: รายงานด้วยแอปพลิเคชัน
resolved: แก้ปัญหาแล้ว
resolved_msg: แก้ปัญหารายงานสำเร็จ!
skip_to_actions: ข้ามไปยังการกระทำ
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 9855b56924..f561781e59 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -471,6 +471,9 @@ tr:
title: Takip önerileri
unsuppress: Takip önerisini geri getir
instances:
+ audit_log:
+ title: En Son Denetim Günlükleri
+ view_all: Tüm denetim günlüklerini görüntüle
availability:
description_html:
one: Eğer alan adına teslimat %{count} gün boyunca başarısız olursa, alan adından bir teslimat gelmedikçe yeni bir iletim denemesi yapılmayacak.
@@ -725,7 +728,7 @@ tr:
manage_users_description: Kullanıcıların, diğer kullanıcıların ayrıntılarını görüntülemesine ve onlara karşı denetim eylemleri gerçekleştirmesine izin verir
manage_webhooks: Webhookları Yönetme
manage_webhooks_description: Kullanıcıların yönetsel olaylar için webhook kurmasına izin verir
- view_audit_log: Denetim Kaydını Görüntüleme
+ view_audit_log: Denetim Günlüğünü Görüntüleme
view_audit_log_description: Kullanıcıların sunucudaki yönetsel eylemlerin bir tarihçesini görüntülemesine izin verir
view_dashboard: Ana Paneli Görüntüleme
view_dashboard_description: Kullanıcıların ana panele ve çeşitli ölçütlere erişmesine izin verir
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a5cdcfefb4..31ce3e6b79 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -487,6 +487,9 @@ uk:
title: Поради щодо підписок
unsuppress: Відновити поради щодо підписок
instances:
+ audit_log:
+ title: Останні журнали перевірки
+ view_all: Переглянути повні журнали перевірки
availability:
description_html:
few: Якщо доставлення до домену не вдалася за %{count} інших дні, жодних спроб доставлення не здійснюється, доки доставлення від домену не отримуватиметься.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 48e026d377..b44ba15a77 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -463,6 +463,9 @@ vi:
title: Gợi ý theo dõi
unsuppress: Mở lại gợi ý theo dõi
instances:
+ audit_log:
+ title: Kiểm duyệt gần đây
+ view_all: Xem lịch sử đầy đủ
availability:
description_html:
other: Nếu chuyển đến tên miền %{count} ngày mà không thành công, không chuyển gì nữa cho tới khi sự tiếp nhận từ máy chủ được nhận.
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d2d64152fa..50921b07d8 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -463,6 +463,9 @@ zh-CN:
title: 关注推荐
unsuppress: 恢复推荐关注
instances:
+ audit_log:
+ title: 近期审计日志
+ view_all: 查看完整审计日志
availability:
description_html:
other: 如果连续 %{count} 天 均无法成功向该域名投递消息，则将不再尝试向其投递，直至收到来自该域名的消息。
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 375c79048a..388fe35d84 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -463,6 +463,9 @@ zh-TW:
title: 跟隨建議
unsuppress: 回復跟隨建議
instances:
+ audit_log:
+ title: 近期審計紀錄
+ view_all: 檢視完整審計紀錄
availability:
description_html:
other: 若於 %{count} 天向某個網域遞送失敗，除非收到某個網域的遞送表單，否則不會繼續嘗試遞送。
diff --git a/yarn.lock b/yarn.lock
index 62069712e7..f5c47052a2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -14069,13 +14069,13 @@ __metadata:
linkType: hard
"postcss@npm:^8.2.15, postcss@npm:^8.4.24, postcss@npm:^8.4.38":
- version: 8.4.39
- resolution: "postcss@npm:8.4.39"
+ version: 8.4.40
+ resolution: "postcss@npm:8.4.40"
dependencies:
nanoid: "npm:^3.3.7"
picocolors: "npm:^1.0.1"
source-map-js: "npm:^1.2.0"
- checksum: 10c0/16f5ac3c4e32ee76d1582b3c0dcf1a1fdb91334a45ad755eeb881ccc50318fb8d64047de4f1601ac96e30061df203f0f2e2edbdc0bfc49b9c57bc9fb9bedaea3
+ checksum: 10c0/65ed67573e5443beaeb582282ff27a6be7c7fe3b4d9fa15761157616f2b97510cb1c335023c26220b005909f007337026d6e3ff092f25010b484ad484e80ea7f
languageName: node
linkType: hard