Merge pull request #2861 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 03210085b7
2024-11-23 08:34:13 -05:00 · 2024-09-30 13:30:14 +02:00 · 2024-09-30 13:30:14 +02:00 · 88756ab75f
commit 88756ab75f
parent 9bf624b44d 9af9ef6fb3
63 changed files with 295 additions and 73 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,12 +10,13 @@ The following changelog entries focus on changes visible to users, administrator

 - **Add confirmation interstitial instead of silently redirecting logged-out visitors to remote resources** (#27792, #28902, and #30651 by @ClearlyClaire and @Gargron)\
  This fixes a longstanding open redirect in Mastodon, at the cost of added friction when local links to remote resources are shared.
+- Fix ReDoS vulnerability on some Ruby versions ([GHSA-jpxp-r43f-rhvx](https://github.com/mastodon/mastodon/security/advisories/GHSA-jpxp-r43f-rhvx))
 - Change `form-action` Content-Security-Policy directive to be more restrictive (#26897 by @ClearlyClaire)
 - Update dependencies

 ### Added

- **Add server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, #31513, #31592, #31594, #31638, #31746, #31652, #31709, #31725, #31745, #31613, #31657, #31840, #31610 and #31929 by @ClearlyClaire, @Gargron, @mgmn, and @renchap)\
+- **Add server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, #31513, #31592, #31594, #31638, #31746, #31652, #31709, #31725, #31745, #31613, #31657, #31840, #31610, #31929, #32089 and #32085 by @ClearlyClaire, @Gargron, @mgmn, and @renchap)\
  Group notifications of the same type for the same target, so that your notifications no longer get cluttered by boost and favorite notifications as soon as a couple of your posts get traction.\
  This is done server-side so that clients can efficiently get relevant groups without having to go through numerous pages of individual notifications.\
  As part of this, the visual design of the entire notifications feature has been revamped.\
@ -27,7 +28,7 @@ The following changelog entries focus on changes visible to users, administrator
  - `GET /api/v2/notifications/:group_key/accounts`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-group-accounts
  - `POST /api/v2/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/grouped_notifications/#dismiss-group
  - `GET /api/v2/notifications/:unread_count`: https://docs.joinmastodon.org/methods/grouped_notifications/#unread-group-count
- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, and #31723 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
+- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, #31723 and #32062 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
  The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\
  You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
  Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
@ -76,7 +77,11 @@ The following changelog entries focus on changes visible to users, administrator
  Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation.
 - **Add support for Redis sentinel** (#31694, #31623, #31744, #31767, and #31768 by @ThisIsMissEm and @oneiros)\
  See https://docs.joinmastodon.org/admin/scaling/#redis-sentinel
- Add ability to reorder uploaded media before posting in web UI (#28456 by @Gargron)
+- **Add ability to reorder uploaded media before posting in web UI** (#28456 and #32093 by @Gargron)
+- Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106 by @ClearlyClaire)
+- Add ability to view alt text by clicking the ALT badge in web UI (#32058 by @Gargron)
+- Add preview of followers removed in domain block modal in web UI (#32032 and #32105 by @ClearlyClaire and @Gargron)
+- Add reblogs and favourites counts to statuses in ActivityPub (#32007 by @Gargron)
 - Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm)
 - Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\
  This is also exposed through the REST API: https://docs.joinmastodon.org/entities/Instance/#icon
@ -122,14 +127,14 @@ The following changelog entries focus on changes visible to users, administrator
 - Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap)
 - Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc)
 - Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan)
- Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, and #30858 by @ClearlyClaire, @Gargron, and @mjankowski)\
+- Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, #30858 and #32104 by @ClearlyClaire, @Gargron, and @mjankowski)\
  Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\
  This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\
  This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future.
 - Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
 - Add anchors to each authorized application in `/oauth/authorized_applications` (#31677 by @fowl2)
 - Add active animation to header settings button (#30221, #30307, and #30388 by @daudix)
- Add OpenTelemetry instrumentation (#30130, #30322, #30353, and #30350 by @julianocosta89, @renchap, and @robbkidd)\
+- Add OpenTelemetry instrumentation (#30130, #30322, #30353, #30350 and #31998 by @julianocosta89, @renchap, @robbkidd and @timetinytim)\
  See https://docs.joinmastodon.org/admin/config/#otel for documentation
 - Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\
  This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index
@ -138,7 +143,6 @@ The following changelog entries focus on changes visible to users, administrator
 - Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm)
 - Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire)
 - Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm)
- Add global Regexp timeout (#31928 by @ClearlyClaire)
 - Add the role ID to the badge component (#29707 by @renchap)
 - Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski)
 - Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski)
@ -167,15 +171,15 @@ The following changelog entries focus on changes visible to users, administrator
 - **Change icons throughout the web interface** (#27385, #27539, #27555, #27579, #27700, #27817, #28519, #28709, #28064, #28775, #28780, #27924, #29294, #29395, #29537, #29569, #29610, #29612, #29649, #29844, #27780, #30974, #30963, #30962, #30961, #31362, #31363, #31359, #31371, #31360, #31512, #31511, and #31525 by @ClearlyClaire, @Gargron, @arbolitoloco1, @mjankowski, @nclm, @renchap, @ronilaukkarinen, and @zunda)\
  This changes all the interface icons from FontAwesome to Material Symbols for a more modern look, consistent with the official Mastodon Android app.\
  In addition, better care is given to pixel alignment, and icon variants are used to better highlight active/inactive state.
- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, #29659, and #31889 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
+- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, #29659, #31889 and #32033 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
  The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\
  As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”.
 - **Change design of modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, #31399, #31555, #31752, #31801, #31883, #31844, #31864, and #31943 by @ClearlyClaire, @Gargron, @tribela and @vmstan)\
  The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\
  They also have a more modern and consistent design, along with other confirmation modals in the application.
- **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
+- **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, #31510 and #32128 by @ClearlyClaire, @Gargron, @mjankowski, @renchap, and @vmstan)
 - **Change onboarding prompt to follow suggestions carousel in web UI** (#28878, #29272, and #31912 by @Gargron)
- **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
+- **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, #29879, #32073 and #32132 by @c960657, @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
  All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to read and keeping maximum compatibility across mail clients.
 - **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
  This replaces the “past interactions” recommendation algorithm with a “friends of friends” algorithm that suggests accounts followed by people you follow, and a “similar profiles” algorithm that suggests accounts with a profile similar to your most recent follows.\
@ -188,10 +192,17 @@ The following changelog entries focus on changes visible to users, administrator
  Administrators may need to update their setup accordingly.
 - Change how content warnings and filters are displayed in web UI (#31365, and #31761 by @Gargron)
 - Change preview card processing to ignore `undefined` as canonical url (#31882 by @oneiros)
- Change embedded posts to use web UI (#31766 by @Gargron)
+- Change embedded posts to use web UI (#31766 and #32135 by @Gargron)
 - Change inner borders in media galleries in web UI (#31852 by @Gargron)
- Change design of hide media button in web UI (#31807 by @Gargron)
+- Change design of media attachments and profile media tab in web UI (#31807, #32048, and #31967 by @Gargron)
 - Change labels on thread indicators in web UI (#31806 by @Gargron)
+- Change label of "Data export" menu item in settings interface (#32099 by @c960657)
+- Change responsive break points on navigation panel in web UI (#32034 by @Gargron)
+- Change cursor to `not-allowed` on disabled buttons (#32076 by @mjankowski)
+- Change OAuth authorization prompt to not refer to apps as “third-party” (#32005 by @Gargron)
+- Change Mastodon to issue correct HTTP signatures by default (#31994 by @ClearlyClaire)
+- Change zoom icon in web UI (#29683 by @Gargron)
+- Change directory page to use URL query strings for options (#31980, #31977 and #31984 by @ClearlyClaire and @renchap)
 - Change report action buttons to be disabled when action has already been taken (#31773, #31822, and #31899 by @ClearlyClaire and @ThisIsMissEm)
 - Change width of columns in advanced web UI (#31762 by @Gargron)
 - Change design of unread conversations in web UI (#31763 by @Gargron)
@ -254,6 +265,7 @@ The following changelog entries focus on changes visible to users, administrator

 ### Removed

+- Remove unused E2EE messaging code and related `crypto` OAuth scope (#31193, #31945, #31963, and #31964 by @ClearlyClaire and @mjankowski)
 - Remove StatsD integration (replaced by OpenTelemetry) (#30240 by @mjankowski)
 - Remove `CacheBuster` default options (#30718 by @mjankowski)
 - Remove home marker updates from the Web UI (#22721 by @davbeck)\
@ -269,9 +281,21 @@ The following changelog entries focus on changes visible to users, administrator
 - Fix log out from user menu not working on Safari (#31402 by @renchap)
 - Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela)
 - Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski)
+- Fix error when accepting an appeal for sensitive posts deleted in the meantime (#32037 by @ClearlyClaire)
+- Fix error when encountering reblog of deleted post in feed rebuild (#32001 by @ClearlyClaire)
+- Fix Safari browser glitch related to horizontal scrolling (#31960 by @Gargron)
+- Fix too many requests caused by relationship look-ups in web UI (#32042 by @Gargron)
+- Fix links for reblogs in moderation interface (#31979 by @ClearlyClaire)
+- Fix the appearance of avatars when they do not load (#31966 by @renchap)
+- Fix spurious error notifications for aborted requests in web UI (#31952 by @c960657)
 - Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil)
 - Fix security context sometimes not being added in LD-Signed activities (#31871 by @ClearlyClaire)
 - Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77)
+- Fix wrapping in dashboard quick access buttons (#32043 by @renchap)
+- Fix recently used tags hint being displayed in profile edition page when there is none (#32120 by @mjankowski)
+- Fix checkbox lists on narrow screens in the settings interface (#32112 by @mjankowski)
+- Fix the position of status action buttons being affected by interaction counters (#32084 by @renchap)
+- Fix the summary of converted ActivityPub object types to be treated as HTML (#28629 by @Menrath)
 - Fix cutoff of instance name in sign-up form (#30598 by @oneiros)
 - Fix invalid date searches returning 503 errors (#31526 by @notchairmk)
 - Fix invalid `visibility` values in `POST /api/v1/statuses` returning 500 errors (#31571 by @c960657)
@ -285,7 +309,7 @@ The following changelog entries focus on changes visible to users, administrator
 - Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm)
 - Fix right-to-left text in preview cards (#30930 by @ClearlyClaire)
 - Fix rack attack `match_type` value typo in logging config (#30514 by @mjankowski)
- Fix various cases of duplicate, missing, or inconsistent borders or scrollbar styles (#31068, #31286, #31268, #31275, #31284, #31305, #31346, #31372, #31373, #31389, #31432, #31391, and #31445 by @valtlai and @vmstan)
+- Fix various cases of duplicate, missing, or inconsistent borders or scrollbar styles (#31068, #31286, #31268, #31275, #31284, #31305, #31346, #31372, #31373, #31389, #31432, #31391, #31445 and #32091 by @ClearlyClaire, @valtlai and @vmstan)
 - Fix race condition in `POST /api/v1/push/subscription` (#30166 by @ClearlyClaire)
 - Fix post deletion not being delayed when those are part of an account warning (#30163 by @ClearlyClaire)
 - Fix rendering error on `/start` when not logged in (#30023 by @timothyjrogers)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -347,7 +347,7 @@ GEM
      activesupport (>= 3.0)
      nokogiri (>= 1.6)
    io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
      rdoc (>= 4.0.0)
      reline (>= 0.4.2)
    jmespath (1.6.2)
@ -601,7 +601,7 @@ GEM
      actionmailer (>= 3)
      net-smtp
      premailer (~> 1.7, >= 1.7.9)
-    propshaft (1.0.0)
+    propshaft (1.0.1)
      actionpack (>= 7.0.0)
      activesupport (>= 7.0.0)
      rack
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Скоростта е ограничена",
  "alert.unexpected.message": "Възникна неочаквана грешка.",
  "alert.unexpected.title": "Опаа!",
+  "alt_text_badge.title": "Алтернативен текст",
  "announcement.announcement": "Оповестяване",
  "attachments_list.unprocessed": "(необработено)",
  "audio.hide": "Скриване на звука",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -852,6 +852,11 @@
  "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
  "upload_form.audio_description": "Descriu-ho per a persones amb problemes d'audició",
  "upload_form.description": "Descriu-ho per a persones amb problemes de visió",
+  "upload_form.drag_and_drop.instructions": "Per a agafar un fitxer multimèdia adjunt, premeu l'espai o la tecla Enter. Mentre l'arrossegueu, utilitzeu les fletxes per a moure l'adjunt en qualsevol direcció. Premeu espai o Enter un altre cop per a deixar-lo anar a la seva nova posició, o premeu la tecla d'escapament per cancel·lar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "S'ha cancel·lat l'arrossegament. S'ha deixat anar l'adjunt multimèdia {item}.",
+  "upload_form.drag_and_drop.on_drag_end": "S'ha deixat anar l'adjunt multimèdia {item}.",
+  "upload_form.drag_and_drop.on_drag_over": "S'ha mogut l'adjunt multimèdia {item}.",
+  "upload_form.drag_and_drop.on_drag_start": "S'ha agafat l'adjunt multimèdia {item}.",
  "upload_form.edit": "Edita",
  "upload_form.thumbnail": "Canvia la miniatura",
  "upload_form.video_description": "Descriu-ho per a persones amb problemes de visió o audició",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
  "upload_form.audio_description": "Beskrivelse til hørehæmmede",
  "upload_form.description": "Beskrivelse til svagtseende",
+  "upload_form.drag_and_drop.instructions": "For at opsamle en medievedhæftning, tryk på Mellemrum eller Retur. Mens der trækkes, benyt piletasterne til at flytte medievedhæftningen i en given retning. Tryk på Mellemrum eller Retur igen for at slippe medievedhæftningen på den nye position, eller tryk på Escape for at afbryde.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Træk blev afbrudt. Medievedhæftningen {item} blev sluppet.",
+  "upload_form.drag_and_drop.on_drag_end": "Medievedhæftningen {item} er sluppet.",
+  "upload_form.drag_and_drop.on_drag_over": "Medievedhæftningen {item} er flyttet.",
+  "upload_form.drag_and_drop.on_drag_start": "Opsamlede medievedhæftningen {item}.",
  "upload_form.edit": "Redigér",
  "upload_form.thumbnail": "Skift miniature",
  "upload_form.video_description": "Beskrivelse for hørehæmmede eller synshandicappede personer",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -229,14 +229,14 @@
  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
  "domain_pill.server": "Server",
  "domain_pill.their_handle": "Deren Adresse:",
-  "domain_pill.their_server": "Deren digitales Zuhause. Hier „leben“ alle Beiträge von diesem Profil.",
+  "domain_pill.their_server": "Deren digitale Heimat. Hier „leben“ alle Beiträge von diesem Profil.",
  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
  "domain_pill.username": "Profilname",
  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
  "domain_pill.your_handle": "Deine Adresse:",
-  "domain_pill.your_server": "Dein digitales Zuhause. Hier „leben“ alle Beiträge von dir. Dir gefällt es hier nicht? Du kannst jederzeit den Server wechseln und ebenso deine Follower übertragen.",
+  "domain_pill.your_server": "Deine digitale Heimat. Hier „leben“ alle Beiträge von dir. Falls es dir hier nicht gefällt, kannst du jederzeit den Server wechseln und ebenso deine Follower übertragen.",
  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
  "embed.instructions": "Du kannst diesen Beitrag auf deiner Website einbetten, indem du den nachfolgenden Code kopierst.",
  "embed.preview": "Vorschau:",
@ -852,6 +852,11 @@
  "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
  "upload_form.audio_description": "Beschreibe für Menschen mit Hörbehinderung",
  "upload_form.description": "Beschreibe für Menschen mit Sehbehinderung",
+  "upload_form.drag_and_drop.instructions": "Drücke zum Aufnehmen eines Medienanhangs die Eingabe- oder Leertaste. Verwende beim Ziehen die Pfeiltasten, um den Medienanhang zur gewünschten Position zu bewegen. Drücke erneut die Eingabe- oder Leertaste, um den Medienanhang an der gewünschten Position abzulegen. Mit der Escape-Taste kannst du den Vorgang abbrechen.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Das Ziehen wurde abgebrochen und der Medienanhang {item} wurde abgelegt.",
+  "upload_form.drag_and_drop.on_drag_end": "Der Medienanhang {item} wurde abgelegt.",
+  "upload_form.drag_and_drop.on_drag_over": "Der Medienanhang {item} wurde bewegt.",
+  "upload_form.drag_and_drop.on_drag_start": "Der Medienanhang {item} wurde aufgenommen.",
  "upload_form.edit": "Bearbeiten",
  "upload_form.thumbnail": "Vorschaubild ändern",
  "upload_form.video_description": "Beschreibe für Menschen mit einer Hör- oder Sehbehinderung",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
  "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
  "upload_form.description": "Priskribi por personoj, kiuj estas blindaj aŭ havas vidmalsufiĉon",
+  "upload_form.drag_and_drop.instructions": "Por preni amaskomunikilaron aldonaĵon, premu spacoklavon aŭ enen-klavon. Dum trenado, uzu la sagoklavojn por movi la amaskomunikilaron aldonaĵon en iu ajn direkto. Premu spacoklavon aŭ enen-klavon denove por faligi la amaskomunikilaron aldonaĵon en ĝia nova pozicio, aŭ premu eskapan klavon por nuligi.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Trenado estis nuligita. Amaskomunikila aldonaĵo {item} estis forigita.",
+  "upload_form.drag_and_drop.on_drag_end": "Amaskomunikila aldonaĵo {item} estis forigita.",
+  "upload_form.drag_and_drop.on_drag_over": "Amaskomunikila aldonaĵo {item} estis movita.",
+  "upload_form.drag_and_drop.on_drag_start": "Prenis amaskomunikilan aldonaĵon {item}.",
  "upload_form.edit": "Redakti",
  "upload_form.thumbnail": "Ŝanĝi etigita bildo",
  "upload_form.video_description": "Priskribi por homoj kiuj malfacile aŭdi aŭ vidi",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -222,8 +222,8 @@
  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
  "domain_block_modal.they_wont_know": "No sabrán que fueron bloqueados.",
  "domain_block_modal.title": "¿Bloquear dominio?",
-  "domain_block_modal.you_will_lose_num_followers": "Perderás {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} persona a la que sigues} other {{followingCountDisplay} personas a las que sigues}}.",
-  "domain_block_modal.you_will_lose_relationships": "Perderás a todos los seguidores y gente a la que sigas de este servidor.",
+  "domain_block_modal.you_will_lose_num_followers": "Perderás {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} cuenta que seguís} other {{followingCountDisplay} cuentas que seguís}}.",
+  "domain_block_modal.you_will_lose_relationships": "Perderás a todos los seguidores y cuentas a las que seguís de este servidor.",
  "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
@ -852,6 +852,11 @@
  "upload_error.poll": "No se permite la subida de archivos en encuestas.",
  "upload_form.audio_description": "Agregá una descripción para personas con dificultades auditivas",
  "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
+  "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
+  "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.video_description": "Agregá una descripción para personas con dificultades auditivas o visuales",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -95,7 +95,7 @@
  "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
  "block_modal.they_cant_see_posts": "No pueden ver tus publicaciones y tú no verás las de ellos.",
  "block_modal.they_will_know": "Pueden ver que están bloqueados.",
-  "block_modal.title": "¿Bloquear usuario?",
+  "block_modal.title": "¿Deseas bloquear al usuario?",
  "block_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
  "boost_modal.combo": "Puedes hacer clic en {combo} para saltar este aviso la próxima vez",
  "boost_modal.reblog": "¿Deseas impulsar la publicación?",
@ -173,9 +173,9 @@
  "confirmations.block.confirm": "Bloquear",
  "confirmations.delete.confirm": "Eliminar",
  "confirmations.delete.message": "¿Estás seguro de que quieres borrar esta publicación?",
-  "confirmations.delete.title": "¿Eliminar publicación?",
+  "confirmations.delete.title": "¿Deseas eliminar la publicación?",
  "confirmations.delete_list.confirm": "Eliminar",
-  "confirmations.delete_list.message": "¿Seguro que quieres borrar esta lista permanentemente?",
+  "confirmations.delete_list.message": "¿Estás seguro de que quieres eliminar esta lista de forma permanente?",
  "confirmations.delete_list.title": "¿Deseas eliminar la lista?",
  "confirmations.discard_edit_media.confirm": "Descartar",
  "confirmations.discard_edit_media.message": "Tienes cambios sin guardar en la descripción o vista previa del archivo, ¿deseas descartarlos de cualquier manera?",
@ -191,7 +191,7 @@
  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
  "confirmations.reply.confirm": "Responder",
  "confirmations.reply.message": "Responder sobrescribirá el mensaje que estás escribiendo. ¿Estás seguro de que deseas continuar?",
-  "confirmations.reply.title": "¿Sobreescribir publicación?",
+  "confirmations.reply.title": "¿Deseas sobreescribir la publicación?",
  "confirmations.unfollow.confirm": "Dejar de seguir",
  "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
@ -221,7 +221,7 @@
  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este servidor pueden interactuar con tus publicaciones antiguas.",
  "domain_block_modal.they_cant_follow": "Nadie de este servidor puede seguirte.",
  "domain_block_modal.they_wont_know": "No sabrán que han sido bloqueados.",
-  "domain_block_modal.title": "¿Bloquear dominio?",
+  "domain_block_modal.title": "¿Deseas bloquear el dominio?",
  "domain_block_modal.you_will_lose_num_followers": "Vas a perder {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} persona a la que sigues} other {{followingCountDisplay} personas a las que sigas}}.",
  "domain_block_modal.you_will_lose_relationships": "Perderás todos los seguidores y las personas que sigues de este servidor.",
  "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
@ -467,7 +467,7 @@
  "mute_modal.show_options": "Mostrar opciones",
  "mute_modal.they_can_mention_and_follow": "Pueden mencionarte y seguirte, pero no verás nada de ellos.",
  "mute_modal.they_wont_know": "No sabrán que han sido silenciados.",
-  "mute_modal.title": "¿Silenciar usuario?",
+  "mute_modal.title": "¿Deseas silenciar el usuario?",
  "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
  "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
  "navigation_bar.about": "Acerca de",
@ -852,6 +852,11 @@
  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
  "upload_form.audio_description": "Describir para personas con problemas auditivos",
  "upload_form.description": "Describir para los usuarios con dificultad visual",
+  "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsa la barra espaciadora o la tecla Enter. Mientras arrastras, utiliza las teclas de flecha para mover el archivo multimedia en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsa Escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} se ha movido.",
+  "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -852,6 +852,11 @@
  "upload_error.poll": "No se permite la subida de archivos con encuestas.",
  "upload_form.audio_description": "Describir para personas con problemas auditivos",
  "upload_form.description": "Describir para personas con discapacidad visual",
+  "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsa la barra espaciadora o la tecla Enter. Mientras arrastras, utiliza las teclas de flecha para mover el archivo multimedia en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsa Escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} se ha movido.",
+  "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar miniatura",
  "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -797,7 +797,7 @@
  "status.history.edited": "{name} muokkasi {date}",
  "status.load_more": "Lataa lisää",
  "status.media.open": "Avaa napsauttamalla",
-  "status.media.show": "Napsauta näyttääksesi",
+  "status.media.show": "Näytä napsauttamalla",
  "status.media_hidden": "Media piilotettu",
  "status.mention": "Mainitse @{name}",
  "status.more": "Enemmän",
@ -852,6 +852,11 @@
  "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
  "upload_form.audio_description": "Kuvaile sisältöä kuuroille ja kuulorajoitteisille",
  "upload_form.description": "Kuvaile sisältöä sokeille ja näkörajoitteisille",
+  "upload_form.drag_and_drop.instructions": "Valitse medialiite painamalla välilyöntiä tai enteriä. Vetäessäsi käytä nuolinäppäimiä siirtääksesi medialiitettä vastaavaan suuntaan. Paina välilyöntiä tai enteriä uudelleen pudottaaksesi medialiitteen uuteen kohtaansa, tai peru siirto painamalla escape-näppäintä.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Veto peruttiin. Medialiitettä {item} ei siirretty.",
+  "upload_form.drag_and_drop.on_drag_end": "Medialiite {item} pudotettiin.",
+  "upload_form.drag_and_drop.on_drag_over": "Medialiitettä {item} siirrettiin.",
+  "upload_form.drag_and_drop.on_drag_start": "Valittiin medialiite {item}.",
  "upload_form.edit": "Muokkaa",
  "upload_form.thumbnail": "Vaihda pienoiskuva",
  "upload_form.video_description": "Kuvaile sisältöä kuuroille, kuulorajoitteisille, sokeille tai näkörajoitteisille",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@ -3,9 +3,15 @@
  "about.contact": "Kontak:",
  "about.disclaimer": "Ang Mastodon ay software na malaya at bukas-na-pinagmulan, at isang tatak-pangkalakal ng Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "Hindi makuha ang dahilan",
+  "about.domain_blocks.preamble": "Sa kadalasan, hinahayaan ka ng Mastodon na makita ang mga content sa, at makipag-interact sa users ng, ibang servers sa fediverse. Narito ang exceptions na ginawa sa partikular na server na ito.",
+  "about.domain_blocks.silenced.explanation": "Sa kadalasan, hindi mo makikita ang profiles at content mula sa server na ito, maliban na lang kung sasadyain mo silang hanapin o piliing magawa ito sa pamamagitan ng mga sumusunod.",
  "about.domain_blocks.silenced.title": "Limitado",
+  "about.domain_blocks.suspended.explanation": "Walang data mula sa server na ito ang mapoproseso, maiimbak o maipagpapaplitan. Sa gayon. imposibleng magawa ang interaksiyon o komunikasyon sa ibang users sa server na ito.",
  "about.domain_blocks.suspended.title": "Suspendido",
+  "about.not_available": "Hindi available ang impormasyong ito.",
+  "about.powered_by": "Decentralisadong social media na pinapagana ng {mastodon}",
  "about.rules": "Mga alituntunin ng server",
+  "account.account_note_header": "Note na personal",
  "account.add_or_remove_from_list": "I-dagdag o tanggalin mula sa mga listahan",
  "account.badges.bot": "Pakusa",
  "account.badges.group": "Pangkat",
@ -216,7 +222,7 @@
  "link_preview.author": "Ni/ng {name}",
  "lists.account.add": "Idagdag sa talaan",
  "lists.account.remove": "Tanggalin mula sa talaan",
-  "lists.delete": "Burahin ang talaan",
+  "lists.delete": "Burahin ang listahan",
  "lists.new.create": "Idagdag sa talaan",
  "lists.new.title_placeholder": "Bagong pangalan ng talaan",
  "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
  "upload_form.audio_description": "Lýs fyri teimum, sum eru deyv ella hava ringa hoyrn",
  "upload_form.description": "Lýs fyri teimum, sum eru blind ella eru sjónveik",
+  "upload_form.drag_and_drop.instructions": "Fyri at heinta eitt miðlaviðfesti, trýst á millumrúm ella returknapp. Meðan tú dregur, brúka pílarnar fyri at flyta miðaviðfesti í einhvønn rætning. Trýst á millumrúm ella returknapp aftur fyri at sleppa miðlaviðfestinum í nýggja staðnum ella trýst á esc-knappin fyri at angra.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Draging varð steðgað. Miðlaviðfestið {item} varð slept.",
+  "upload_form.drag_and_drop.on_drag_end": "Miðlaviðfestið {item} var slept.",
+  "upload_form.drag_and_drop.on_drag_over": "Miðlaviðfestið {item} var flutt.",
+  "upload_form.drag_and_drop.on_drag_start": "Heintaði miðlaviðfestið {item}.",
  "upload_form.edit": "Rætta",
  "upload_form.thumbnail": "Broyt smámynd",
  "upload_form.video_description": "Lýs fyri teimum, sum eru deyv, hava ringa hoyrn, eru blind ella eru sjónveik",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Débit limité",
  "alert.unexpected.message": "Une erreur inattendue s’est produite.",
  "alert.unexpected.title": "Oups!",
+  "alt_text_badge.title": "Texte Alt",
  "announcement.announcement": "Annonce",
  "attachments_list.unprocessed": "(non traité)",
  "audio.hide": "Masquer l'audio",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
+  "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
@ -433,6 +436,8 @@
  "lightbox.close": "Fermer",
  "lightbox.next": "Suivant",
  "lightbox.previous": "Précédent",
+  "lightbox.zoom_in": "Zoomer sur la taille réelle",
+  "lightbox.zoom_out": "Zoomer pour adapter",
  "limited_account_hint.action": "Afficher le profil quand même",
  "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
  "link_preview.author": "Par {name}",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Nombre de requêtes limité",
  "alert.unexpected.message": "Une erreur inattendue s’est produite.",
  "alert.unexpected.title": "Oups !",
+  "alt_text_badge.title": "Texte Alt",
  "announcement.announcement": "Annonce",
  "attachments_list.unprocessed": "(non traité)",
  "audio.hide": "Masquer l'audio",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
  "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
  "domain_block_modal.title": "Bloquer le domaine ?",
+  "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
+  "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
@ -433,6 +436,8 @@
  "lightbox.close": "Fermer",
  "lightbox.next": "Suivant",
  "lightbox.previous": "Précédent",
+  "lightbox.zoom_in": "Zoomer sur la taille réelle",
+  "lightbox.zoom_out": "Zoomer pour adapter",
  "limited_account_hint.action": "Afficher le profil quand même",
  "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
  "link_preview.author": "Par {name}",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Rátatheoranta",
  "alert.unexpected.message": "Tharla earráid gan choinne.",
  "alert.unexpected.title": "Hiúps!",
+  "alt_text_badge.title": "Téacs alt",
  "announcement.announcement": "Fógra",
  "attachments_list.unprocessed": "(neamhphróiseáilte)",
  "audio.hide": "Cuir fuaim i bhfolach",
@ -222,6 +223,7 @@
  "domain_block_modal.they_wont_know": "Ní bheidh a fhios acu go bhfuil bac orthu.",
  "domain_block_modal.title": "Blocáil fearann?",
  "domain_block_modal.you_will_lose_num_followers": "Caillfidh tú {followersCount, plural, one {{followersCountDisplay} leantóir} two {{followersCountDisplay} leantóirí} few {{followersCountDisplay} leantóirí} many {{followersCountDisplay} leantóirí} other {{followersCountDisplay} leantóirí}} agus {followingCount, plural, one {{followingCountDisplay} duine atá á leanúint agat} two {{followingCountDisplay} daoine atá á leanúint agat} few {{followingCountDisplay} daoine atá á leanúint agat} many {{followingCountDisplay} daoine atá á leanúint agat} other {{followingCountDisplay} daoine atá á leanúint agat}}.",
+  "domain_block_modal.you_will_lose_relationships": "Caillfidh tú gach leantóir agus duine a leanann tú ón bhfreastalaí seo.",
  "domain_block_modal.you_wont_see_posts": "Ní fheicfidh tú postálacha nó fógraí ó úsáideoirí ar an bhfreastalaí seo.",
  "domain_pill.activitypub_lets_connect": "Ligeann sé duit ceangal agus idirghníomhú le daoine, ní hamháin ar Mastodon, ach thar aipeanna sóisialta éagsúla freisin.",
  "domain_pill.activitypub_like_language": "Tá GníomhaíochtPub cosúil leis an teanga a labhraíonn Mastodon le líonraí sóisialta eile.",
@ -850,6 +852,11 @@
  "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
  "upload_form.audio_description": "Déan cur síos ar dhaoine bodhra nó lagéisteachta",
  "upload_form.description": "Describe for the visually impaired",
+  "upload_form.drag_and_drop.instructions": "Chun ceangaltán meán a phiocadh suas, brúigh spás nó cuir isteach. Agus tú ag tarraingt, bain úsáid as na heochracha saigheada chun an ceangaltán meán a bhogadh i dtreo ar bith. Brúigh spás nó cuir isteach arís chun an ceangaltán meán a scaoileadh ina phost nua, nó brúigh éalú chun cealú.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Cuireadh an tarraingt ar ceal. Scaoileadh ceangaltán meán {item}.",
+  "upload_form.drag_and_drop.on_drag_end": "Scaoileadh ceangaltán meán {item}.",
+  "upload_form.drag_and_drop.on_drag_over": "Bogadh ceangaltán meán {item}.",
+  "upload_form.drag_and_drop.on_drag_start": "Roghnaíodh ceangaltán meán {item}.",
  "upload_form.edit": "Cuir in eagar",
  "upload_form.thumbnail": "Athraigh mionsamhail",
  "upload_form.video_description": "Déan cur síos ar dhaoine atá bodhar, lagéisteachta, dall nó lagamhairc",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
  "upload_form.audio_description": "Describir para persoas con problemas auditivos",
  "upload_form.description": "Describir para persoas cegas ou con problemas visuais",
+  "upload_form.drag_and_drop.instructions": "Preme en Espazo ou Enter para escoller un anexo multimedia. Ao arrastrar usa as teclas de frecha para mover o anexo en todas direccións.Preme Espazo ou Enter outra vez para soltalo na súa nova posición, ou preme Escape para desbotar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Cancelouse o movemento. O anexo {item} soltouse.",
+  "upload_form.drag_and_drop.on_drag_end": "Soltouse o anexo multimedia {item}.",
+  "upload_form.drag_and_drop.on_drag_over": "Moveuse o anexo multimedia {item}.",
+  "upload_form.drag_and_drop.on_drag_start": "Escolleuse o anexo multimedia {item}.",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Cambiar a miniatura",
  "upload_form.video_description": "Describe para persoas con problemas visuais ou auditivos",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -99,7 +99,7 @@
  "block_modal.you_wont_see_mentions": "Vu ne vidos mesaji qua mencionas oli.",
  "boost_modal.combo": "Vu povas pulsar {combo} por omisar co venontafoye",
  "boost_modal.reblog": "Ka repetar posto?",
-  "boost_modal.undo_reblog": "Ka retrorepetar posto?",
+  "boost_modal.undo_reblog": "Ka desrepetar posto?",
  "bundle_column_error.copy_stacktrace": "Kopierorraporto",
  "bundle_column_error.error.body": "La demandita pagino ne povas strukturigesar. Forsan ol esas eroro en kodexo hike o vidilkoncilieblesproblemo.",
  "bundle_column_error.error.title": "Ach!",
@ -194,7 +194,7 @@
  "confirmations.reply.title": "Ka remplasar posto?",
  "confirmations.unfollow.confirm": "Desequez",
  "confirmations.unfollow.message": "Ka vu certe volas desequar {name}?",
-  "confirmations.unfollow.title": "Ka retrosequar uzanto?",
+  "confirmations.unfollow.title": "Ka dessequar uzanto?",
  "content_warning.hide": "Celez posto",
  "content_warning.show": "Montrez nur",
  "conversation.delete": "Efacez konverso",
@ -463,7 +463,7 @@
  "moved_to_account_banner.text": "Vua konto {disabledAccount} es nune desaktiva pro ke vu movis a {movedToAccount}.",
  "mute_modal.hide_from_notifications": "Celez de savigi",
  "mute_modal.hide_options": "Celez preferaji",
-  "mute_modal.indefinite": "Til me retrosilencigas lu",
+  "mute_modal.indefinite": "Til me dessilencigas lu",
  "mute_modal.show_options": "Montrez preferaji",
  "mute_modal.they_can_mention_and_follow": "Lu povas mencionar e sequar vu, ma vu ne vidos lu.",
  "mute_modal.they_wont_know": "Lu ne savos ke lu silencigesis.",
@ -852,6 +852,11 @@
  "upload_error.poll": "Failadchargo ne permisesas kun votposti.",
  "upload_form.audio_description": "Deskriptez por personi kun audnekapableso",
  "upload_form.description": "Deskriptez por personi kun vidnekapableso",
+  "upload_form.drag_and_drop.instructions": "Por tenar mediatachajo, presez spaco o eniro. Presez spaco o eniro itere por destenar la mediatachajo en olua nova loko, o presez eskapo por anular.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Tiro anulesis. Mediatachajo {item} destenesis.",
+  "upload_form.drag_and_drop.on_drag_end": "Mediatachajo {item} destenesis.",
+  "upload_form.drag_and_drop.on_drag_over": "Mediatachajo {item} movigesis.",
+  "upload_form.drag_and_drop.on_drag_start": "Tenis mediatachajo {item}.",
  "upload_form.edit": "Modifikez",
  "upload_form.thumbnail": "Chanjez imajeto",
  "upload_form.video_description": "Deskriptez por personi kun audnekapableso o vidnekapableso",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -73,6 +73,7 @@
  "alert.rate_limited.title": "Aktum s talast",
  "alert.unexpected.message": "Yeḍra-d unezri ur netturaǧu ara.",
  "alert.unexpected.title": "Ayhuh!",
+  "alt_text_badge.title": "Aḍris asegzan",
  "announcement.announcement": "Ulɣu",
  "audio.hide": "Ffer amesli",
  "block_modal.show_less": "Ssken-d drus",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -31,7 +31,7 @@
  "account.featured_tags.last_status_never": "게시물 없음",
  "account.featured_tags.title": "{name} 님의 추천 해시태그",
  "account.follow": "팔로우",
-  "account.follow_back": "맞팔로우 하기",
+  "account.follow_back": "맞팔로우",
  "account.followers": "팔로워",
  "account.followers.empty": "아직 아무도 이 사용자를 팔로우하고 있지 않습니다.",
  "account.followers_counter": "{count, plural, other {팔로워 {counter}명}}",
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "빈도 제한됨",
  "alert.unexpected.message": "예상하지 못한 에러가 발생했습니다.",
  "alert.unexpected.title": "앗!",
+  "alt_text_badge.title": "대체 문구",
  "announcement.announcement": "공지사항",
  "attachments_list.unprocessed": "(처리 안 됨)",
  "audio.hide": "소리 숨기기",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "이 서버의 누구도 나를 팔로우 할 수 없습니다.",
  "domain_block_modal.they_wont_know": "내가 차단했다는 사실을 모를 것입니다.",
  "domain_block_modal.title": "도메인을 차단할까요?",
+  "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {{followersCountDisplay} 명의 팔로워}}와 {followingCount, plural, other {{followingCountDisplay} 명의 팔로우}}를 잃게 됩니다.",
+  "domain_block_modal.you_will_lose_relationships": "이 서버의 팔로워와 팔로우를 모두 잃게 됩니다.",
  "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
  "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
  "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 쓰는 언어 같은 것입니다.",
@ -849,6 +852,11 @@
  "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
  "upload_form.audio_description": "청각장애인이나 저청각자를 위한 설명",
  "upload_form.description": "시각장애인이나 저시력자를 위한 설명",
+  "upload_form.drag_and_drop.instructions": "미디어 첨부파일을 집으려면 스페이스나 엔터를 누르세요. 드래그 하는 동안 방향키를 이용해 원하는 방향으로 이동할 수 있습니다. 스페이스나 엔터를 다시 눌러 새 위치에 놓거나 ESC를 이용해 취소할 수 있습니다.",
+  "upload_form.drag_and_drop.on_drag_cancel": "드래그가 취소되었습니다. 미디어 첨부파일 {item}은 이동되지 않았습니다.",
+  "upload_form.drag_and_drop.on_drag_end": "미디어 첨부파일 {item}은 이동되지 않았습니다.",
+  "upload_form.drag_and_drop.on_drag_over": "미디어 첨부파일 {item}이 이동되었습니다.",
+  "upload_form.drag_and_drop.on_drag_start": "미디어 첨부파일 {item}을 집었습니다.",
  "upload_form.edit": "수정",
  "upload_form.thumbnail": "썸네일 변경",
  "upload_form.video_description": "청각장애인, 저청각자, 시각장애인, 저시력자를 위한 설명",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -1,7 +1,7 @@
 {
  "about.blocks": "Prižiūrimi serveriai",
  "about.contact": "Kontaktai:",
-  "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon“ gGmbH prekės ženklas.",
+  "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon gGmbH“ prekės ženklas.",
  "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
  "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
  "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekant.",
@ -840,6 +840,11 @@
  "upload_error.poll": "Failų įkėlimas neleidžiamas su apklausomis.",
  "upload_form.audio_description": "Aprašyk žmonėms, kurie yra kurtieji ar neprigirdintys.",
  "upload_form.description": "Aprašyk žmonėms, kurie yra aklieji arba silpnaregiai.",
+  "upload_form.drag_and_drop.instructions": "Kad paimtum medijos priedą, paspausk tarpo arba įvedimo klavišą. Tempant naudok rodyklių klavišus, kad perkeltum medijos priedą bet kuria kryptimi. Dar kartą paspausk tarpo arba įvedimo klavišą, kad nuleistum medijos priedą naujoje vietoje, arba paspausk grįžimo klavišą, kad atšauktum.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Nutempimas buvo atšauktas. Medijos priedas {item} buvo nuleistas.",
+  "upload_form.drag_and_drop.on_drag_end": "Medijos priedas {item} buvo nuleistas.",
+  "upload_form.drag_and_drop.on_drag_over": "Medijos priedas {item} buvo perkeltas.",
+  "upload_form.drag_and_drop.on_drag_start": "Paimtas medijos priedas {item}.",
  "upload_form.edit": "Redaguoti",
  "upload_form.thumbnail": "Keisti miniatiūrą",
  "upload_form.video_description": "Aprašyk žmonėms, kurie yra kurtieji, neprigirdintys, aklieji ar silpnaregiai.",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
  "upload_form.audio_description": "Omschrijf dit voor dove of slechthorende mensen",
  "upload_form.description": "Omschrijf dit voor blinde of slechtziende mensen",
+  "upload_form.drag_and_drop.instructions": "Druk op spatie of enter om een mediabijlage op te pakken. Gebruik de pijltjestoetsen om de bijlage in een bepaalde richting te verplaatsen. Druk opnieuw op de spatiebalk of enter om de mediabijlage op de nieuwe positie te plaatsen, of druk op escape om te annuleren.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Slepen is geannuleerd. Mediabijlage {item} is niet verplaatst.",
+  "upload_form.drag_and_drop.on_drag_end": "Mediabijlage {item} is niet verplaatst.",
+  "upload_form.drag_and_drop.on_drag_over": "Mediabijlage {item} is verplaatst.",
+  "upload_form.drag_and_drop.on_drag_start": "Mediabijlage {item} is opgepakt.",
  "upload_form.edit": "Bewerken",
  "upload_form.thumbnail": "Miniatuurafbeelding wijzigen",
  "upload_form.video_description": "Omschrijf dit voor dove, slechthorende, blinde of slechtziende mensen",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Redusert kapasitet",
  "alert.unexpected.message": "Det oppstod eit uventa problem.",
  "alert.unexpected.title": "Oi sann!",
+  "alt_text_badge.title": "Alternativ tekst",
  "announcement.announcement": "Kunngjering",
  "attachments_list.unprocessed": "(ubehandla)",
  "audio.hide": "Gøym lyd",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Ingen på denne tenaren kan fylgja deg.",
  "domain_block_modal.they_wont_know": "Dei veit ikkje at dei er blokkerte.",
  "domain_block_modal.title": "Blokker domenet?",
+  "domain_block_modal.you_will_lose_num_followers": "Du vil mista {followersCount, plural, one {{followersCountDisplay} fylgjar} other {{followersCountDisplay} fylgjarar}} og {followingCount, plural, one {{followingCountDisplay} person du fylgjer} other {{followingCountDisplay} folk du fylgjer}}.",
+  "domain_block_modal.you_will_lose_relationships": "Du vil mista alle fylgjarar og folk du fylgjer på denne tenaren.",
  "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
  "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
  "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
@ -849,6 +852,11 @@
  "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
  "upload_form.audio_description": "Skildre for dei med nedsett høyrsel",
  "upload_form.description": "Skildre for blinde og svaksynte",
+  "upload_form.drag_and_drop.instructions": "For å plukka opp eit medievedlegg, trykkjer du på mellomrom eller enter. Når du dreg, brukar du piltastane for å flytta vedlegget i den retninga du vil. Deretter trykkjer du mellomrom eller enter att for å sleppa vedlegget på den nye plassen, eller trykk escape for å avbryta.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Du avbraut draginga. Medievedlegget {item} vart sleppt.",
+  "upload_form.drag_and_drop.on_drag_end": "Medeivedlegget {item} vart sleppt.",
+  "upload_form.drag_and_drop.on_drag_over": "Medievedlegget {item} vart flytta.",
+  "upload_form.drag_and_drop.on_drag_start": "Plukka opp medievedlegget {item}.",
  "upload_form.edit": "Rediger",
  "upload_form.thumbnail": "Bytt miniatyrbilete",
  "upload_form.video_description": "Skildre for dei med nedsett høyrsel eller redusert syn",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -852,6 +852,11 @@
  "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
  "upload_form.audio_description": "Opisz dla osób niesłyszących i niedosłyszących",
  "upload_form.description": "Wprowadź opis dla niewidomych i niedowidzących",
+  "upload_form.drag_and_drop.instructions": "Naciśnij spację lub enter żeby podnieść załącznik. Podczas przeciągania, strzałki przesuwają załącznik. Naciśnięcie spacji lub entera upuści załącznik w nowym miejscu, a escape anuluje przesuwanie.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Przesuwanie anulowane. Załącznik {item} upuszczony.",
+  "upload_form.drag_and_drop.on_drag_end": "Upuszczono załącznik {item}.",
+  "upload_form.drag_and_drop.on_drag_over": "Przesunięto załącznik {item}.",
+  "upload_form.drag_and_drop.on_drag_start": "Podniesiono załącznik {item}.",
  "upload_form.edit": "Edytuj",
  "upload_form.thumbnail": "Zmień miniaturę",
  "upload_form.video_description": "Opisz dla osób niesłyszących, niedosłyszących, niewidomych i niedowidzących",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "มีการจำกัดอัตรา",
  "alert.unexpected.message": "เกิดข้อผิดพลาดที่ไม่คาดคิด",
  "alert.unexpected.title": "อุปส์!",
+  "alt_text_badge.title": "ข้อความแสดงแทน",
  "announcement.announcement": "ประกาศ",
  "attachments_list.unprocessed": "(ยังไม่ได้ประมวลผล)",
  "audio.hide": "ซ่อนเสียง",
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Vượt giới hạn",
  "alert.unexpected.message": "Đã xảy ra lỗi không mong muốn.",
  "alert.unexpected.title": "Ốiii!",
+  "alt_text_badge.title": "Văn bản thay thế",
  "announcement.announcement": "Có gì mới?",
  "attachments_list.unprocessed": "(chưa xử lí)",
  "audio.hide": "Ẩn âm thanh",
@ -463,7 +464,7 @@
  "mute_modal.hide_from_notifications": "Ẩn thông báo",
  "mute_modal.hide_options": "Tùy chọn ẩn",
  "mute_modal.indefinite": "Cho tới khi bỏ ẩn",
-  "mute_modal.show_options": "Hiển thị tùy chọn",
+  "mute_modal.show_options": "Thêm tùy chọn",
  "mute_modal.they_can_mention_and_follow": "Họ có thể nhắc đến và theo dõi bạn, nhưng bạn không thấy họ.",
  "mute_modal.they_wont_know": "Họ sẽ không biết đã bị bạn ẩn.",
  "mute_modal.title": "Ẩn người này?",
@ -752,7 +753,7 @@
  "search_popout.language_code": "mã ngôn ngữ ISO",
  "search_popout.options": "Tìm nâng cao",
  "search_popout.quick_actions": "Thao tác nhanh",
-  "search_popout.recent": "Bạn đã tìm",
+  "search_popout.recent": "Lượt tìm gần đây",
  "search_popout.specific_date": "ngày cụ thể",
  "search_popout.user": "địa chỉ Mastodon",
  "search_results.accounts": "Mọi người",
@ -779,7 +780,7 @@
  "status.bookmark": "Lưu",
  "status.cancel_reblog_private": "Hủy đăng lại",
  "status.cannot_reblog": "Không thể đăng lại tút này",
-  "status.continued_thread": "Tiếp tục trong chủ đề",
+  "status.continued_thread": "Tiếp tục chủ đề",
  "status.copy": "Sao chép URL",
  "status.delete": "Xóa",
  "status.detailed_status": "Xem chi tiết thêm",
@ -813,7 +814,7 @@
  "status.reblogs.empty": "Tút này chưa có ai đăng lại. Nếu có, nó sẽ hiển thị ở đây.",
  "status.redraft": "Xóa và viết lại",
  "status.remove_bookmark": "Bỏ lưu",
-  "status.replied_in_thread": "Trả lời trong chủ đề",
+  "status.replied_in_thread": "Trả lời thảo luận",
  "status.replied_to": "Trả lời {name}",
  "status.reply": "Trả lời",
  "status.replyAll": "Trả lời",
@ -851,6 +852,11 @@
  "upload_error.poll": "Không cho phép đính kèm tập tin.",
  "upload_form.audio_description": "Mô tả cho người mất thính giác",
  "upload_form.description": "Mô tả cho người khiếm thị",
+  "upload_form.drag_and_drop.instructions": "Để chọn tập tin đính kèm, hãy nhấn phím cách hoặc phím Enter. Trong khi kéo, sử dụng các phím mũi tên để di chuyển tập tin đính kèm theo bất kỳ hướng nào. Nhấn phím cách hoặc phím Enter một lần nữa để thả tập tin đính kèm vào vị trí mới hoặc nhấn phím thoát để hủy.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Kéo thả đã bị hủy bỏ. Tập tin đính kèm {item} bị bỏ qua.",
+  "upload_form.drag_and_drop.on_drag_end": "Tập tin đính kèm {item} bị bỏ qua.",
+  "upload_form.drag_and_drop.on_drag_over": "Tập tin đính kèm {item} đã bị dời.",
+  "upload_form.drag_and_drop.on_drag_start": "Đã chọn tập tin đính kèm {item}.",
  "upload_form.edit": "Biên tập",
  "upload_form.thumbnail": "Đổi ảnh thumbnail",
  "upload_form.video_description": "Mô tả cho người mất thị lực hoặc không thể nghe",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -852,6 +852,11 @@
  "upload_error.poll": "投票中不允许上传文件。",
  "upload_form.audio_description": "为听障人士添加文字描述",
  "upload_form.description": "为视觉障碍人士添加文字说明",
+  "upload_form.drag_and_drop.instructions": "要选中某个媒体附件，请按空格键或回车键。在拖拽时，使用方向键将媒体附件移动到任何给定方向。再次按空格键或回车键可将媒体附件放置在新位置，或按 Esc 键取消。",
+  "upload_form.drag_and_drop.on_drag_cancel": "拖拽已终止。媒体附件 {item} 已被丢弃。",
+  "upload_form.drag_and_drop.on_drag_end": "媒体附件 {item} 已被丢弃。",
+  "upload_form.drag_and_drop.on_drag_over": "媒体附件 {item} 已被移动。",
+  "upload_form.drag_and_drop.on_drag_start": "已选中媒体附件 {item}。",
  "upload_form.edit": "编辑",
  "upload_form.thumbnail": "更改缩略图",
  "upload_form.video_description": "为听障人士和视障人士添加文字描述",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -852,6 +852,11 @@
  "upload_error.poll": "不允許於投票時上傳檔案。",
  "upload_form.audio_description": "為聽障人士增加文字說明",
  "upload_form.description": "為視障人士增加文字說明",
+  "upload_form.drag_and_drop.instructions": "請按空白鍵或 Enter 鍵取多媒體附加檔案。使用方向鍵移動多媒體附加檔案。按下空白鍵或 Enter 鍵於新位置放置多媒體附加檔案，或按下 ESC 鍵取消。",
+  "upload_form.drag_and_drop.on_drag_cancel": "移動已取消。多媒體附加檔案 {item} 已被放置。",
+  "upload_form.drag_and_drop.on_drag_end": "多媒體附加檔案 {item} 已被放置。",
+  "upload_form.drag_and_drop.on_drag_over": "多媒體附加檔案 {item} 已被移動。",
+  "upload_form.drag_and_drop.on_drag_start": "多媒體附加檔案 {item} 已被選取。",
  "upload_form.edit": "編輯",
  "upload_form.thumbnail": "更改預覽圖",
  "upload_form.video_description": "為聽障或視障人士增加文字說明",
--- a/app/models/account.rb
+++ b/app/models/account.rb
@ -68,8 +68,8 @@ class Account < ApplicationRecord
  DEFAULT_FIELDS_SIZE = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
  INSTANCE_ACTOR_ID = -99

-  USERNAME_RE   = /[a-z0-9_]+([a-z0-9_.-]+[a-z0-9_]+)?/i
-  MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:].-]+[[:word:]]+)?)}
+  USERNAME_RE   = /[a-z0-9_]+([.-]+[a-z0-9_]+)*/i
+  MENTION_RE    = %r{(?<![=/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]]+([.-]+[[:word:]]+)*)?)}
  URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
  USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
  USERNAME_LENGTH_LIMIT = 30
--- a/config/initializers/regexp.rb
+++ b/config/initializers/regexp.rb
@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-# 2s is a fairly high default, but that should account for slow servers under load
-Regexp.timeout = ENV.fetch('REGEXP_TIMEOUT', 2).to_f if Regexp.respond_to?(:timeout=)
--- a/config/locales/activerecord.bg.yml
+++ b/config/locales/activerecord.bg.yml
@ -15,6 +15,12 @@ bg:
      user/invite_request:
        text: Причина
    errors:
+      attributes:
+        domain:
+          invalid: не е действително име на домейн
+      messages:
+        invalid_domain_on_line: "%{value} не е действително име на домейн"
+        too_many_lines: е над ограничение от %{limit} реда
      models:
        account:
          attributes:
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -877,7 +877,7 @@ de:
        message_html: Kein Sidekiq-Prozess läuft für die %{value} Warteschlange(n). Bitte überprüfe deine Sidekiq-Konfiguration
      software_version_check:
        action: Verfügbare Updates ansehen
-        message_html: Ein Update für Mastodon ist verfügbar.
+        message_html: Ein Mastodon-Update ist verfügbar.
      software_version_critical_check:
        action: Verfügbare Updates ansehen
        message_html: Ein kritisches Mastodon-Update ist verfügbar – bitte aktualisiere so schnell wie möglich.
@ -1425,7 +1425,7 @@ de:
    max_uses:
      one: Eine Verwendung
      other: "%{count} Verwendungen"
-    max_uses_prompt: Keine Einschränkung
+    max_uses_prompt: Unbegrenzt
    prompt: Erstelle Einladungen und teile die dazugehörigen Links, um anderen einen Zugang zu diesem Server zu gewähren
    table:
      expires_at: Läuft ab
@ -1903,7 +1903,7 @@ de:
      feature_action: Mehr erfahren
      feature_audience: Mastodon bietet dir eine einzigartige Möglichkeit, deine Reichweite ohne Mittelsperson zu verwalten. Auf deiner eigenen Infrastruktur bereitgestellt, ermöglicht Mastodon es dir, jedem anderen Mastodon-Server zu folgen und von jedem anderen Server aus gefolgt zu werden. Ebenso steht Mastodon unter deiner Kontrolle.
      feature_audience_title: Baue deine Reichweite mit Vertrauen auf
-      feature_control: Du weißt am besten, was du auf deiner Startseite sehen möchtest. Keine Algorithmen oder Werbung, die deine Zeit verschwenden. Folge Nutzer*innen von jedem Mastodon-Server von einem einzelnen Konto aus und empfange deren Beiträge in chronologischer Reihenfolge. Mache Mastodon zu deinem ganz persönlichen Fleckchen im Internet.
+      feature_control: Du weißt am besten, was du auf deiner Startseite sehen möchtest. Keine Algorithmen oder Werbung, die deine Zeit verschwenden. Folge Nutzer*innen auf allen Mastodon-Servern von einem einzelnen Konto aus und empfange deren Beiträge in chronologischer Reihenfolge. Mache Mastodon zu deinem ganz persönlichen Fleckchen im Internet.
      feature_control_title: Behalte die Kontrolle über deine eigene Timeline
      feature_creativity: Mastodon unterstützt Audio-, Video- und Bildbeiträge, Beschreibungen, Umfragen, Inhaltswarnungen, animierte Avatare, benutzerdefinierte Emojis, das Zuschneiden von Vorschaubildern und vieles mehr, um dir zu helfen, dich online zu entfalten. Egal, ob du deine Kunst, deine Musik oder deinen Podcast veröffentlichst – Mastodon ist für dich da.
      feature_creativity_title: Einzigartige Kreativität
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@ -72,9 +72,11 @@ eo:
          subject: 'Mastodon: sekureca ŝlosilo forigita'
          title: Unu el viaj sekurecaj ŝlosiloj estis forigita
      webauthn_disabled:
+        explanation: Aŭtentigo per sekurecaj ŝlosiloj estas malŝaltita por via konto.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
        title: Sekurecaj ŝlosiloj malaktivigitaj
      webauthn_enabled:
+        extra: Via sekureca ŝlosilo nun povas esti uzata por ensaluto.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
        title: Sekurecaj ŝlosiloj aktivigitaj
    omniauth_callbacks:
--- a/config/locales/doorkeeper.bg.yml
+++ b/config/locales/doorkeeper.bg.yml
@ -60,6 +60,7 @@ bg:
      error:
        title: Възникна грешка
      new:
+        prompt_html: "%{client_name} желае да има достъп до акаунта ви. <strong>Одобрявайте само тази заявка, ако я разпознавате и ако имате доворерие на източника.</strong>"
        review_permissions: Преглед на разрешенията
        title: Изисква се упълномощаване
      show:
--- a/config/locales/doorkeeper.es-AR.yml
+++ b/config/locales/doorkeeper.es-AR.yml
@ -60,7 +60,7 @@ es-AR:
      error:
        title: Ocurrió un error
      new:
-        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Solo aprueba esta solicitud si reconoces y confías en esta fuente.</strong>
+        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Aprobá esta solicitud solo si reconocés y confiás en esta fuente.</strong>
        review_permissions: Revisar permisos
        title: Autorización requerida
      show:
--- a/config/locales/doorkeeper.es-MX.yml
+++ b/config/locales/doorkeeper.es-MX.yml
@ -60,7 +60,7 @@ es-MX:
      error:
        title: Ha ocurrido un error
      new:
-        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Solo aprueba esta solicitud si reconoces y confías en esta fuente.</strong>
+        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Aprueba esta solicitud solo si reconoces y confías en esta fuente.</strong>
        review_permissions: Revisar permisos
        title: Se requiere autorización
      show:
--- a/config/locales/doorkeeper.es.yml
+++ b/config/locales/doorkeeper.es.yml
@ -60,7 +60,7 @@ es:
      error:
        title: Ha ocurrido un error
      new:
-        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Solo aprueba esta solicitud si reconoces y confías en esta fuente.</strong>
+        prompt_html: A %{client_name} le gustaría obtener permiso para acceder a tu cuenta. <strong>Aprueba esta solicitud solo si reconoces y confías en esta fuente.</strong>
        review_permissions: Revisar permisos
        title: Se requiere autorización
      show:
--- a/config/locales/doorkeeper.fr-CA.yml
+++ b/config/locales/doorkeeper.fr-CA.yml
@ -60,6 +60,7 @@ fr-CA:
      error:
        title: Une erreur est survenue
      new:
+        prompt_html: "%{client_name} aimerait avoir la permission d'accéder à votre compte. <strong>Approuver cette demande uniquement si vous reconnaissez et faites confiance à cette source.</strong>"
        review_permissions: Examiner les autorisations
        title: Autorisation requise
      show:
--- a/config/locales/doorkeeper.fr.yml
+++ b/config/locales/doorkeeper.fr.yml
@ -60,6 +60,7 @@ fr:
      error:
        title: Une erreur est survenue
      new:
+        prompt_html: "%{client_name} aimerait avoir la permission d'accéder à votre compte. <strong>Approuver cette demande uniquement si vous reconnaissez et faites confiance à cette source.</strong>"
        review_permissions: Examiner les autorisations
        title: Autorisation requise
      show:
--- a/config/locales/doorkeeper.ko.yml
+++ b/config/locales/doorkeeper.ko.yml
@ -60,6 +60,7 @@ ko:
      error:
        title: 오류가 발생하였습니다
      new:
+        prompt_html: "%{client_name}이 계정에 접근할 권한을 요청합니다. <strong>내가 알아볼 수 있고 신뢰할 수 있는 출처의 요청인 경우에만 승인하세요.</strong>"
        review_permissions: 권한 검토
        title: 승인 필요
      show:
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -821,8 +821,12 @@ eo:
        message_html: Vi ne difinis iujn servilajn regulojn.
      sidekiq_process_check:
        message_html: Neniu Sidekiq-procezo por la %{value} vico
+      software_version_check:
+        message_html: Mastodon-ĝisdatigo disponeblas.
      software_version_critical_check:
        action: Vidi disponeblajn ĝisdatigojn
+      software_version_patch_check:
+        action: Vidi disponeblajn ĝisdatigojn
      upload_check_privacy_error:
        action: Klaku ĉi tie por pliaj informoj
        message_html: "<strong>Via retservilo estas misagordita. La privateco de viaj uzantoj estas en risko.</strong>"
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@ -875,6 +875,9 @@ es-AR:
        message_html: No definiste ninguna regla del servidor.
      sidekiq_process_check:
        message_html: No hay ningún proceso Sidekiq en ejecución para la/s cola/s %{value}. Por favor, revisá tu configuración de Sidekiq
+      software_version_check:
+        action: Ver actualizaciones disponibles
+        message_html: Hay disponible una actualización de Mastodon.
      software_version_critical_check:
        action: Ver actualizaciones disponibles
        message_html: Una actualización crítica de Mastodon está disponible; por favor, actualizá lo antes posible.
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@ -875,6 +875,9 @@ es-MX:
        message_html: No ha definido ninguna regla del servidor.
      sidekiq_process_check:
        message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
+      software_version_check:
+        action: Ver actualizaciones disponibles
+        message_html: Hay disponible una actualización de Mastodon.
      software_version_critical_check:
        action: Ver actualizaciones disponibles
        message_html: Una actualización crítica de Mastodon está disponible, por favor actualice lo antes posible.
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -875,6 +875,9 @@ es:
        message_html: No ha definido ninguna regla del servidor.
      sidekiq_process_check:
        message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
+      software_version_check:
+        action: Ver actualizaciones disponibles
+        message_html: Hay disponible una actualización de Mastodon.
      software_version_critical_check:
        action: Ver actualizaciones disponibles
        message_html: Una actualización crítica de Mastodon está disponible, por favor actualiza lo antes posible.
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -875,6 +875,9 @@ fi:
        message_html: Et ole määritellyt palvelimen sääntöjä lainkaan.
      sidekiq_process_check:
        message_html: Ei ole Sidekiq-prosessia käynnissä jonossa %{value}. Tarkista Sidekiq-asetukset
+      software_version_check:
+        action: Näytä saatavilla olevat päivitykset
+        message_html: Saatavilla on Mastodon-päivitys.
      software_version_critical_check:
        action: Näytä saatavilla olevat päivitykset
        message_html: Kriittinen Mastodon-päivitys on saatavilla. Tee päivitys mahdollisimman ripeästi.
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@ -875,6 +875,9 @@ fo:
        message_html: Tú hevur ikki ásett nakrar ambætarareglur.
      sidekiq_process_check:
        message_html: Eingin Sidekiq gongd koyrir fyri %{value} bíðirøðina(r). Vinarliga eftirkanna Sidekiq uppsetingina
+      software_version_check:
+        action: Sí tøkar dagføringar
+        message_html: Ein Mastodon-dagføring er tøk.
      software_version_critical_check:
        action: Sí tøkar dagføringar
        message_html: Ein kritisk Mastodon-dagføring er tøk, vinarliga dagfør sum skjótast.
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@ -262,8 +262,10 @@ fr-CA:
        destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
        disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
        disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification par jeton de courriel pour %{target}"
        disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
        enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification par jeton de courriel pour %{target}"
        enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
        memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
        promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
@ -876,6 +878,9 @@ fr-CA:
        message_html: Vous n'avez pas défini de règles pour le serveur.
      sidekiq_process_check:
        message_html: Aucun processus Sidekiq en cours d'exécution pour la/les file(s) d'attente %{value}. Veuillez vérifier votre configuration de Sidekiq
+      software_version_check:
+        action: Voir les mises à jour disponibles
+        message_html: Une mise à jour de Mastodon est disponible.
      software_version_critical_check:
        action: Voir les mises à jour disponibles
        message_html: Une mise à jour critique de Mastodon est disponible, veuillez mettre à jour le plus rapidement possible.
@ -1447,6 +1452,7 @@ fr-CA:
    unsubscribe:
      action: Oui, me désabonner
      complete: Désabonné·e
+      confirmation_html: Êtes-vous sûr de vouloir vous désabonner de la réception de %{type} pour Mastodon sur %{domain} à votre adresse e-mail %{email} ? Vous pouvez toujours vous réabonner à partir de vos paramètres de <a href="%{settings_path}">notification par messagerie</a>.
      emails:
        notification_emails:
          favourite: e-mails de notifications de favoris
@ -1692,6 +1698,7 @@ fr-CA:
    delete: Suppression du compte
    development: Développement
    edit_profile: Modifier le profil
+    export: Exportation
    featured_tags: Hashtags mis en avant
    import: Import de données
    import_and_export: Import et export
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@ -262,8 +262,10 @@ fr:
        destroy_user_role_html: "%{name} a supprimé le rôle %{target}"
        disable_2fa_user_html: "%{name} a désactivé l'authentification à deux facteurs pour l'utilisateur·rice %{target}"
        disable_custom_emoji_html: "%{name} a désactivé l'émoji %{target}"
+        disable_sign_in_token_auth_user_html: "%{name} a désactivé l'authentification par jeton de courriel pour %{target}"
        disable_user_html: "%{name} a désactivé la connexion de l'utilisateur·rice %{target}"
        enable_custom_emoji_html: "%{name} a activé l'émoji %{target}"
+        enable_sign_in_token_auth_user_html: "%{name} a activé l'authentification par jeton de courriel pour %{target}"
        enable_user_html: "%{name} a activé la connexion de l'utilisateur·rice %{target}"
        memorialize_account_html: "%{name} a converti le compte de %{target} en un mémorial"
        promote_user_html: "%{name} a promu l'utilisateur·rice %{target}"
@ -427,7 +429,7 @@ fr:
      undo: Annuler le blocage de domaine
      view: Afficher les blocages de domaines
    email_domain_blocks:
-      add_new: Ajouter
+      add_new: Ajouter un nouveau
      allow_registrations_with_approval: Autoriser les inscriptions avec approbation
      attempts_over_week:
        one: "%{count} tentative au cours de la dernière semaine"
@ -876,6 +878,9 @@ fr:
        message_html: Vous n'avez pas défini de règles pour le serveur.
      sidekiq_process_check:
        message_html: Aucun processus Sidekiq en cours d'exécution pour la/les file(s) d'attente %{value}. Veuillez vérifier votre configuration de Sidekiq
+      software_version_check:
+        action: Voir les mises à jour disponibles
+        message_html: Une mise à jour de Mastodon est disponible.
      software_version_critical_check:
        action: Voir les mises à jour disponibles
        message_html: Une mise à jour critique de Mastodon est disponible, veuillez mettre à jour le plus rapidement possible.
@ -1447,6 +1452,7 @@ fr:
    unsubscribe:
      action: Oui, se désinscrire
      complete: Désinscrit
+      confirmation_html: Êtes-vous sûr de vouloir vous désabonner de la réception de %{type} pour Mastodon sur %{domain} à votre adresse e-mail %{email} ? Vous pouvez toujours vous réabonner à partir de vos paramètres de <a href="%{settings_path}">notification par messagerie</a>.
      emails:
        notification_emails:
          favourite: e-mails de notifications de favoris
@ -1692,6 +1698,7 @@ fr:
    delete: Suppression du compte
    development: Développement
    edit_profile: Modifier le profil
+    export: Exportation
    featured_tags: Hashtags mis en avant
    import: Import de données
    import_and_export: Import et export
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@ -917,6 +917,9 @@ ga:
        message_html: Níl aon rialacha freastalaí sainmhínithe agat.
      sidekiq_process_check:
        message_html: Níl próiseas Sidekiq ag rith don scuaine/(scuainí) %{value}. Déan athbhreithniú ar do chumraíocht Sidekiq
+      software_version_check:
+        action: Féach nuashonruithe atá ar fáil
+        message_html: Tá nuashonrú Mastodon ar fáil.
      software_version_critical_check:
        action: Féach nuashonruithe atá ar fáil
        message_html: Tá nuashonrú ríthábhachtach Mastodon ar fáil, nuashonraigh chomh tapa agus is féidir le do thoil.
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -875,6 +875,9 @@ hu:
        message_html: Még nem definiáltál egy szerver szabályt sem.
      sidekiq_process_check:
        message_html: Nincs Sidekiq folyamat, mely a %{value} sorhoz van rendelve. Kérlek, nézd át a Sidekiq beállításait
+      software_version_check:
+        action: Elérhető frissítések megtekintése
+        message_html: Egy Mastodon-frissítés elérhető.
      software_version_critical_check:
        action: Elérhető frissítések megtekintése
        message_html: Kritikus Mastodon frissítés érhető el, frissíts a lehető leggyorsabban.
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -863,6 +863,9 @@ ko:
        message_html: 아직 서버 규칙을 정하지 않았습니다.
      sidekiq_process_check:
        message_html: "%{value} 큐에 대한 사이드킥 프로세스가 발견되지 않았습니다. 사이드킥 설정을 검토해주세요"
+      software_version_check:
+        action: 사용 가능한 업데이트 보기
+        message_html: 마스토돈 업데이트가 있습니다.
      software_version_critical_check:
        action: 사용 가능한 업데이트 보기
        message_html: 긴급 마스토돈 업데이트가 있으니, 가능한 서둘러 업데이트 해주세요.
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -1695,6 +1695,7 @@ nn:
    delete: Kontosletting
    development: Utvikling
    edit_profile: Endr profil
+    export: Eksporter
    featured_tags: Utvalgte emneknagger
    import: Hent inn
    import_and_export: Importer og eksporter
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -875,6 +875,9 @@ pt-BR:
        message_html: Você não definiu nenhuma regra de servidor.
      sidekiq_process_check:
        message_html: Nenhum processo Sidekiq rodando para a(s) fila(s) %{value}. Por favor, revise a sua configuração para Sidekiq
+      software_version_check:
+        action: Ver atualizações disponíveis
+        message_html: Uma atualização do Mastodon está disponível.
      software_version_critical_check:
        action: Ver atualizações disponíveis
        message_html: Uma atualização crítica do Mastodon está disponível. Por favor, atualize o mais rápido possível.
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@ -3,6 +3,7 @@ bg:
  simple_form:
    hints:
      account:
+        attribution_domains_as_text: Защитава от фалшиви атрибути.
        discoverable: Вашите публични публикации и профил може да се представят или препоръчват в различни области на Mastodon и вашия профил може да се предлага на други потребители.
        display_name: Вашето пълно име или псевдоним.
        fields: Вашата начална страница, местоимения, години, всичко що искате.
@ -130,6 +131,7 @@ bg:
        name: Можете да смените само употребата на големи/малки букви, например, за да е по-четимо
      user:
        chosen_languages: Само публикации на отметнатите езици ще се показват в публичните часови оси
+        role: Ролята управлява какви позволения има потребителят.
      user_role:
        color: Цветът, използван за ролите в потребителския интерфейс, като RGB в шестнадесетичен формат
        highlighted: Това прави ролята обществено видима
@ -142,6 +144,7 @@ bg:
        url: До къде ще се изпращат събитията
    labels:
      account:
+        attribution_domains_as_text: Позволяване само на особени уебсайтове
        discoverable: Включване на профил и публикации в алгоритмите за откриване
        fields:
          name: Етикет
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@ -3,6 +3,7 @@ eo:
  simple_form:
    hints:
      account:
+        attribution_domains_as_text: Protektas kontraŭ falsaj atribuoj.
        discoverable: Viaj publikaj afiŝoj kaj profilo povas esti prezentitaj aŭ rekomenditaj en diversaj lokoj de Mastodon kaj via profilo povas esti proponita al aliaj uzantoj.
        display_name: Via plena nomo aŭ via kromnomo.
        fields: Via retpaĝo, pronomoj, aĝo, ĉio, kion vi volas.
@ -78,6 +79,7 @@ eo:
        bootstrap_timeline_accounts: Ĉi tiuj kontoj pinglitas al la supro de sekvorekomendoj de novaj uzantoj.
        closed_registrations_message: Montrita kiam registroj fermitas
        custom_css: Vi povas meti propajn stilojn en la retversio de Mastodon.
+        favicon: WEBP, PNG, GIF aŭ JPG. Anstataŭigas la defaŭltan Mastodon-favikono kun propra bildsimbolo.
        mascot: Anstatauigi la ilustraĵon en la altnivela retinterfaco.
        peers_api_enabled: Listo de domajnaj nomoj kiujn ĉi tiu servilo renkontis en la fediverso. Neniuj datumoj estas inkluditaj ĉi tie pri ĉu vi federacias kun donita servilo, nur ke via servilo scias pri ĝi. Ĉi tio estas uzata de servoj kiuj kolektas statistikojn pri federacio en ĝenerala signifo.
        profile_directory: La profilujo listigas ĉiujn uzantojn kiu volonte malkovrebli.
@ -111,6 +113,7 @@ eo:
          sign_up_requires_approval: Novaj registriĝoj bezonos vian aprobon
        severity: Elektu, kio okazos pri petoj de ĉi tiu IP-adreso
      rule:
+        hint: Laŭvola. Provizu pliajn detalojn pri la regulo
        text: Priskribu regulon aŭ neceson por uzantoj en ĉi tiu servilo. Provu fari ĝin mallonga kaj simpla
      sessions:
        otp: 'Enmetu la kodon de dufaktora aŭtentigo el via telefono aŭ uzu unu el viaj realiraj kodoj:'
@ -122,6 +125,7 @@ eo:
        name: Vi povas ŝanĝi nur la majuskladon de la literoj, ekzemple, por igi ĝin pli legebla
      user:
        chosen_languages: Kun tio markita nur mesaĝoj en elektitaj lingvoj aperos en publikaj tempolinioj
+        role: La rolo kontrolas kiujn permesojn la uzanto havas.
      user_role:
        color: Koloro uzita por la rolo sur la UI, kun RGB-formato
        highlighted: Ĉi tio igi la rolon publike videbla
@ -134,6 +138,7 @@ eo:
        url: Kien eventoj sendotas
    labels:
      account:
+        attribution_domains_as_text: Permesi nur specifajn retejojn
        discoverable: Elstarigi profilon kaj afiŝojn en eltrovantaj algoritmoj
        fields:
          name: Etikedo
@ -239,6 +244,7 @@ eo:
        bootstrap_timeline_accounts: Ĉiam rekomendi ĉi tiujn kontojn al novaj uzantoj
        closed_registrations_message: Kutima mesaĝo kiam registroj ne estas disponeblaj
        custom_css: Propa CSS
+        favicon: Favorikono
        mascot: Propa maskoto
        media_cache_retention_period: Audovidaĵkaŝaĵretendauro
        peers_api_enabled: Eldonu liston de malkovritaj serviloj en la API
@ -294,6 +300,7 @@ eo:
          patch: Sciigi pri cimoriparaj ĝisdatigoj
        trending_tag: Nova furoro bezonas kontrolon
      rule:
+        hint: Pliaj informoj
        text: Regulo
      settings:
        indexable: Inkludi profilan paĝon en serĉiloj
@ -302,6 +309,7 @@ eo:
        listable: Permesi ĉi tiun kradvorton aperi en serĉoj kaj sugestoj
        name: Kradvorto
        trendable: Permesi al ĉi tiu kradvorto aperi en furoraĵoj
+        usable: Permesi afiŝojn uzi ĉi tiun kradvorton loke
      user:
        role: Rolo
        time_zone: Horzono
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -860,6 +860,8 @@ sv:
        message_html: Du har inte definierat några serverregler.
      sidekiq_process_check:
        message_html: Ingen Sidekiq-process körs för kön/köerna %{value}. Vänligen kontrollera din Sidekiq-konfiguration
+      software_version_check:
+        message_html: En Mastodon-uppdatering är tillgänglig.
      software_version_critical_check:
        action: Se tillgängliga uppdateringar
        message_html: En kritisk uppdatering för Mastodon är tillgänglig. Uppdatera så snart som möjligt.
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@ -861,12 +861,15 @@ th:
        message_html: คุณไม่ได้กำหนดกฎของเซิร์ฟเวอร์ใด ๆ
      sidekiq_process_check:
        message_html: ไม่มีกระบวนการ Sidekiq ที่กำลังทำงานสำหรับคิว %{value} โปรดตรวจทานการกำหนดค่า Sidekiq ของคุณ
+      software_version_check:
+        action: ดูการอัปเดตที่พร้อมใช้งาน
+        message_html: มีการอัปเดต Mastodon ที่พร้อมใช้งาน
      software_version_critical_check:
        action: ดูการอัปเดตที่พร้อมใช้งาน
        message_html: มีการอัปเดต Mastodon สำคัญพร้อมใช้งาน โปรดอัปเดตโดยเร็วที่สุดเท่าที่จะเป็นไปได้
      software_version_patch_check:
        action: ดูการอัปเดตที่พร้อมใช้งาน
-        message_html: มีการอัปเดต Mastodon ที่แก้ไขข้อบกพร่องพร้อมใช้งาน
+        message_html: มีการอัปเดต Mastodon ที่แก้ไขข้อบกพร่องที่พร้อมใช้งาน
      upload_check_privacy_error:
        action: ตรวจสอบที่นี่สำหรับข้อมูลเพิ่มเติม
        message_html: "<strong>เว็บเซิร์ฟเวอร์ของคุณกำหนดค่าไม่ถูกต้อง ความเป็นส่วนตัวของผู้ใช้ของคุณตกอยู่ในความเสี่ยง</strong>"
@ -1666,6 +1669,7 @@ th:
    delete: การลบบัญชี
    development: การพัฒนา
    edit_profile: แก้ไขโปรไฟล์
+    export: ส่งออก
    featured_tags: แฮชแท็กที่น่าสนใจ
    import: การนำเข้า
    import_and_export: การนำเข้าและการส่งออก
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -875,6 +875,9 @@ tr:
        message_html: Herhangi bir sunucu kuralı belirlemediniz.
      sidekiq_process_check:
        message_html: "%{value} kuyruk(lar)ı için herhangi bir Sidekiq süreci çalışmıyor. Lütfen Sidekiq yapılandırmanızı gözden geçirin"
+      software_version_check:
+        action: Mevcut güncellemeleri görün
+        message_html: Mastodon güncellemesi mevcut.
      software_version_critical_check:
        action: Mevcut güncellemeleri göster
        message_html: Kritik bir Mastodon güncellemesi var, lütfen en kısa sürede güncelleyin.
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -91,7 +91,7 @@ vi:
      moderation:
        active: Hoạt động
        all: Tất cả
-        disabled: Đã tắt
+        disabled: Khóa đăng nhập
        pending: Chờ
        silenced: Hạn chế
        suspended: Vô hiệu hóa
@ -861,6 +861,9 @@ vi:
        message_html: Bạn chưa cập nhật nội quy máy chủ.
      sidekiq_process_check:
        message_html: Sidekiq không hoạt động khi truy vấn %{value}. Hãy kiểm tra lại cấu hình Sidekiq
+      software_version_check:
+        action: Bản cập nhật mới
+        message_html: Có bản cập nhật Mastodon mới.
      software_version_critical_check:
        action: Bản cập nhật mới
        message_html: Có bản cập nhật quan trọng của Mastodon, vui lòng cập nhật nhanh nhất có thể.
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -59,7 +59,7 @@ services:
  web:
    # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
    # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
+    image: ghcr.io/mastodon/mastodon:v4.3.0-rc.1
    restart: always
    env_file: .env.production
    command: bundle exec puma -C config/puma.rb
@ -83,7 +83,7 @@ services:
    # build:
    #   dockerfile: ./streaming/Dockerfile
    #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.2
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-rc.1
    restart: always
    env_file: .env.production
    command: node ./streaming/index.js
@ -101,7 +101,7 @@ services:

  sidekiq:
    build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-beta.2
+    image: ghcr.io/mastodon/mastodon:v4.3.0-rc.1
    restart: always
    env_file: .env.production
    command: bundle exec sidekiq
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@ -17,7 +17,7 @@ module Mastodon
    end

    def default_prerelease
-      'beta.2'
+      'rc.1'
    end

    def prerelease
--- a/public/embed.js
+++ b/public/embed.js
@ -81,7 +81,7 @@ const allowedPrefixes = (document.currentScript && document.currentScript.tagNam
      embeds.set(id, iframe);

      iframe.allow = 'fullscreen';
-      iframe.sandbox = 'allow-scripts allow-same-origin';
+      iframe.sandbox = 'allow-scripts allow-same-origin allow-popups';
      iframe.style.border = 0;
      iframe.style.overflow = 'hidden';
      iframe.style.display = 'block';
@ -112,7 +112,7 @@ const allowedPrefixes = (document.currentScript && document.currentScript.tagNam
      iframe.width = container.clientWidth;
      iframe.height = 0;
      iframe.allow = 'fullscreen';
-      iframe.sandbox = 'allow-scripts allow-same-origin';
+      iframe.sandbox = 'allow-scripts allow-same-origin allow-popups';
      iframe.style.border = 0;
      iframe.style.overflow = 'hidden';
      iframe.style.display = 'block';
--- a/yarn.lock
+++ b/yarn.lock
@ -3765,9 +3765,9 @@ __metadata:
  linkType: hard

 "@types/lodash@npm:^4.14.195":
-  version: 4.17.7
-  resolution: "@types/lodash@npm:4.17.7"
-  checksum: 10c0/40c965b5ffdcf7ff5c9105307ee08b782da228c01b5c0529122c554c64f6b7168fc8f11dc79aa7bae4e67e17efafaba685dc3a47e294dbf52a65ed2b67100561
+  version: 4.17.9
+  resolution: "@types/lodash@npm:4.17.9"
+  checksum: 10c0/54de935e835508b5f835a5dfaedd2b9a299685a21d11e9c5cd2dde57331d03bc2f98b71d2424ca8460f447ecd55a673e45ccdb70e58f9f72745710f6b91abc60
  languageName: node
  linkType: hard

@ -3986,12 +3986,12 @@ __metadata:
  linkType: hard

 "@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:>=16.9.11, @types/react@npm:^18.2.7":
-  version: 18.3.8
-  resolution: "@types/react@npm:18.3.8"
+  version: 18.3.10
+  resolution: "@types/react@npm:18.3.10"
  dependencies:
    "@types/prop-types": "npm:*"
    csstype: "npm:^3.0.2"
-  checksum: 10c0/367312c9fe276639ecb142265e090a4dd04bb39f8d718cbab546de3f1ddcfddeff415e1147d0fc40f734badaa7420b7b109d511bd4304b2c4c9c36164612fdf8
+  checksum: 10c0/f5be1de1b0331c1fdb33d577f4cf7f1b949d4bded5347b2351a537f03c51dade5be115e21b161dcf1b37061954d320f6a0bdf8d7b70e24eda51071fdd614383d
  languageName: node
  linkType: hard

@ -15544,15 +15544,15 @@ __metadata:
  linkType: hard

 "sass@npm:^1.62.1":
-  version: 1.79.3
-  resolution: "sass@npm:1.79.3"
+  version: 1.79.4
+  resolution: "sass@npm:1.79.4"
  dependencies:
    chokidar: "npm:^4.0.0"
    immutable: "npm:^4.0.0"
    source-map-js: "npm:>=0.6.2 <2.0.0"
  bin:
    sass: sass.js
-  checksum: 10c0/ad171bbbb2d7a789cc47803a59dcf2d0ac92ede34b538bb3fd683b6391a9ac3dc3eabaac264fc9582c770c4e435b85840e011785b7adfc0ac002b51ba91179c9
+  checksum: 10c0/505ff0d9267d0fb990971e617acfeabf7c060c55d4cef68fe8a4bc693e7ea88ae7d7caeca3975e4b453459ba4a707b6e5b6979fc9395a7e08f0a43ca6aed06b8
  languageName: node
  linkType: hard

@ -17281,20 +17281,13 @@ __metadata:
  languageName: node
  linkType: hard

-"tslib@npm:^2.0.0":
+"tslib@npm:^2.0.0, tslib@npm:^2.4.0, tslib@npm:^2.6.2":
  version: 2.7.0
  resolution: "tslib@npm:2.7.0"
  checksum: 10c0/469e1d5bf1af585742128827000711efa61010b699cb040ab1800bcd3ccdd37f63ec30642c9e07c4439c1db6e46345582614275daca3e0f4abae29b0083f04a6
  languageName: node
  linkType: hard

-"tslib@npm:^2.4.0, tslib@npm:^2.6.2":
-  version: 2.6.3
-  resolution: "tslib@npm:2.6.3"
-  checksum: 10c0/2598aef53d9dbe711af75522464b2104724d6467b26a60f2bdac8297d2b5f1f6b86a71f61717384aa8fd897240467aaa7bcc36a0700a0faf751293d1331db39a
-  languageName: node
-  linkType: hard
-
 "tty-browserify@npm:0.0.0":
  version: 0.0.0
  resolution: "tty-browserify@npm:0.0.0"