Bump version to 15.5 LTS (#929)

Release: 15.4 LTS

.env.production.sample

@@ -45,6 +45,17 @@ ES_PASS=password
 SECRET_KEY_BASE=
 OTP_SECRET=
 
+# Encryption secrets
+# ------------------
+# Must be available (and set to same values) for all server processes
+# These are private/secret values, do not share outside hosting environment
+# Use `bin/rails db:encryption:init` to generate fresh secrets
+# Do not change these secrets once in use, as this would cause data loss and other issues
+# ------------------
+# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=
+# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=
+# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=
+
 # Web Push
 # --------
 # Generate with `bundle exec rails mastodon:webpush:generate_vapid_key`

.github/workflows/crowdin-download-stable.yml

@@ -50,7 +50,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7.0.1
+        uses: peter-evans/create-pull-request@v7.0.5
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations for ${{ github.base_ref || github.ref_name }} (automated)'

.github/workflows/test-migrations.yml

@@ -35,6 +35,8 @@ jobs:
         postgres:
           - 14-alpine
           - 15-alpine
+          - 16-alpine
+          - 17-alpine
 
     services:
       postgres:

.github/workflows/test-ruby.yml

@@ -147,7 +147,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg libpam-dev
+          additional-system-dependencies: ffmpeg imagemagick libpam-dev
 
       - name: Load database schema
         run: |
@@ -249,7 +249,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg libpam-dev libyaml-dev
+          additional-system-dependencies: ffmpeg libpam-dev
 
       - name: Load database schema
         run: './bin/rails db:create db:schema:load db:seed'
@@ -330,7 +330,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg
+          additional-system-dependencies: ffmpeg imagemagick
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript
@@ -450,7 +450,7 @@ jobs:
         uses: ./.github/actions/setup-ruby
         with:
           ruby-version: ${{ matrix.ruby-version}}
-          additional-system-dependencies: ffmpeg
+          additional-system-dependencies: ffmpeg imagemagick
 
       - name: Set up Javascript environment
         uses: ./.github/actions/setup-javascript

CHANGELOG.md

@@ -2,7 +2,49 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.3.0] - UNRELEASED
+## [4.3.1] - 2024-10-21
+
+### Added
+
+- Add more explicit explanations about author attribution and `fediverse:creator` (#32383 by @ClearlyClaire)
+- Add ability to group follow notifications in WebUI, can be disabled in the column settings (#32520 by @renchap)
+- Add back a 6 hours mute duration option (#32522 by @renchap)
+- Add note about not changing ActiveRecord encryption secrets once they are set (#32413, #32476, #32512, and #32537 by @ClearlyClaire and @mjankowski)
+
+### Changed
+
+- Change translation feature to translate to selected regional variant (e.g. pt-BR) if available (#32428 by @c960657)
+
+### Removed
+
+- Remove ability to get embed code for remote posts (#32578 by @ClearlyClaire)\
+  Getting the embed code is only reliable for local posts.\
+  It never worked for non-Mastodon servers, and stopped working correctly with the changes made in 4.3.0.\
+  We have therefore decided to remove the menu entry while we investigate solutions.
+
+### Fixed
+
+- Fix follow recommendation moderation page default language when using regional variant (#32580 by @ClearlyClaire)
+- Fix column-settings spacing in local timeline in advanced view (#32567 by @lindwurm)
+- Fix broken i18n in text welcome mailer tags area (#32571 by @mjankowski)
+- Fix missing or incorrect cache-control headers for Streaming server (#32551 by @ThisIsMissEm)
+- Fix only the first paragraph being displayed in some notifications (#32348 by @ClearlyClaire)
+- Fix reblog icons on account media view (#32506 by @tribela)
+- Fix Content-Security-Policy not allowing OpenStack SWIFT object storage URI (#32439 by @kenkiku1021)
+- Fix back arrow pointing to the incorrect direction in RTL languages (#32485 by @renchap)
+- Fix streaming server using `REDIS_USERNAME` instead of `REDIS_USER` (#32493 by @ThisIsMissEm)
+- Fix follow recommendation carrousel scrolling on RTL layouts (#32462 and #32505 by @ClearlyClaire)
+- Fix follow recommendation suppressions not applying immediately (#32392 by @ClearlyClaire)
+- Fix language of push notifications (#32415 by @ClearlyClaire)
+- Fix mute duration not being shown in list of muted accounts in web UI (#32388 by @ClearlyClaire)
+- Fix “Mark every notification as read” not updating the read marker if scrolled down (#32385 by @ClearlyClaire)
+- Fix “Mention” appearing for otherwise filtered posts (#32356 by @ClearlyClaire)
+- Fix notification requests from suspended accounts still being listed (#32354 by @ClearlyClaire)
+- Fix list edition modal styling (#32358 and #32367 by @ClearlyClaire and @vmstan)
+- Fix 4 columns barely not fitting on 1920px screen (#32361 by @ClearlyClaire)
+- Fix icon alignment in applications list (#32293 by @mjankowski)
+
+## [4.3.0] - 2024-10-08
 
 The following changelog entries focus on changes visible to users, administrators, client developers or federated software developers, but there has also been a lot of code modernization, refactoring, and tooling work, in particular by @mjankowski.
 
@@ -11,12 +53,12 @@ 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)
+- Change `form-action` Content-Security-Policy directive to be more restrictive (#26897 and #32241 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, #31929, #32089 and #32085 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, #32085, #32243, #32179 and #32254 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.\
@@ -28,7 +70,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, #31723 and #32062 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, #32062 and #32281 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.\
@@ -61,13 +103,13 @@ The following changelog entries focus on changes visible to users, administrator
 - **Add timeline of public posts about a trending link** (#30381 and #30840 by @Gargron)\
   You can now see public posts mentioning currently-trending articles from people who have opted into discovery features.\
   This adds a new REST API endpoint: https://docs.joinmastodon.org/methods/timelines/#link
-- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, #30846, #31819, and #31900 by @Gargron and @oneiros)\
+- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, #30846, #31819, #31900 and #32188 by @Gargron, @mjankowski and @oneiros)\
   This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\
   Articles hosted outside the fediverse can indicate a fediverse author with a meta tag:
   ```html
   <meta name="fediverse:creator" content="username@domain" />
   ```
-  On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors\
+  On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors \
   Users can allow arbitrary domains to use `fediverse:creator` to credit them by visiting `/settings/verification`.\
   This is federated as a new `attributionDomains` property in the `http://joinmastodon.org/ns` namespace, containing an array of domain names: https://docs.joinmastodon.org/spec/activitypub/#properties-used-1
 - **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\
@@ -150,10 +192,12 @@ The following changelog entries focus on changes visible to users, administrator
 - Add groundwork for annual reports for accounts (#28693 by @Gargron)\
   This lays the groundwork for a “year-in-review”/“wrapped” style report for local users, but is currently not in use.
 - Add notification email on invalid second authenticator (#28822 by @ClearlyClaire)
+- Add date of account deletion in list of accounts in the admin interface (#25640 by @tribela)
 - Add new emojis from `jdecked/twemoji` 15.0 (#28404 by @TheEssem)
 - Add configurable error handling in attachment batch deletion (#28184 by @vmstan)\
   This makes the S3 batch size configurable through the `S3_BATCH_DELETE_LIMIT` environment variable (defaults to 1000), and adds some retry logic, configurable through the `S3_BATCH_DELETE_RETRY` environment variable (defaults to 3).
 - Add VAPID public key to instance serializer (#28006 by @ThisIsMissEm)
+- Add support for serving JRD `/.well-known/host-meta.json` in addition to XRD host-meta (#32206 by @c960657)
 - Add `nodeName` and `nodeDescription` to nodeinfo `metadata` (#28079 by @6543)
 - Add Thai diacritics and tone marks in `HASHTAG_INVALID_CHARS_RE` (#26576 by @ppnplus)
 - Add variable delay before link verification of remote account links (#27774 by @ClearlyClaire)
@@ -168,7 +212,7 @@ The following changelog entries focus on changes visible to users, administrator
 
 ### Changed
 
-- **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)\
+- **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, #31525, #32153, and #32201 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, #31889 and #32033 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
@@ -192,9 +236,9 @@ 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 and #32135 by @Gargron)
+- Change embedded posts to use web UI (#31766, #32135 and #32271 by @Gargron)
 - Change inner borders in media galleries in web UI (#31852 by @Gargron)
-- Change design of media attachments and profile media tab in web UI (#31807, #32048, and #31967 by @Gargron)
+- Change design of media attachments and profile media tab in web UI (#31807, #32048, #31967, #32217, #32224 and #32257 by @ClearlyClaire and @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)
@@ -284,9 +328,10 @@ The following changelog entries focus on changes visible to users, administrator
 - 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 unresolvable mentions sometimes preventing processing incoming posts (#29215 by @tribela and @ClearlyClaire)
 - 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 the appearance of avatars when they do not load (#31966 and #32270 by @Gargron and @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)
@@ -309,10 +354,12 @@ 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, #31445 and #32091 by @ClearlyClaire, @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, #32091, #32147 and #32137 by @ClearlyClaire, @mjankowski, @valtlai and @vmstan)
+- Fix editing description of media uploads with custom thumbnails (#32221 by @ClearlyClaire)
 - 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)
+- Fix unneeded requests to blocked domains when receiving relayed signed activities from them (#31161 by @ClearlyClaire)
 - Fix logo pushing header buttons out of view on certain conditions in mobile layout (#29787 by @ClearlyClaire)
 - Fix notification-related records not being reattributed when merging accounts (#29694 by @ClearlyClaire)
 - Fix results/query in `api/v1/featured_tags/suggestions` (#29597 by @mjankowski)
@@ -322,6 +369,7 @@ The following changelog entries focus on changes visible to users, administrator
 - Fix full date display not respecting the locale 12/24h format (#29448 by @renchap)
 - Fix filters title and keywords overflow (#29396 by @GeopJr)
 - Fix incorrect date format in “Follows and followers” (#29390 by @JasonPunyon)
+- Fix navigation item active highlight for some paths (#32159 by @mjankowski)
 - Fix “Edit media” modal sizing and layout when space-constrained (#27095 by @ronilaukkarinen)
 - Fix modal container bounds (#29185 by @nico3333fr)
 - Fix inefficient HTTP signature parsing using regexps and `StringScanner` (#29133 by @ClearlyClaire)

Gemfile.lock

@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.4)
+    actioncable (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.4)
+    actionmailbox (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.4)
+    actionmailer (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.4.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.4)
+    actionpack (7.1.4.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -46,15 +46,15 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.4)
+    actiontext (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.4)
+    actionview (7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,22 +64,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.4)
+    activejob (7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.4)
+    activemodel (7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
-    activerecord (7.1.4)
+    activerecord (7.1.4.1)
-      activemodel (= 7.1.4)
+      activemodel (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.4)
+    activestorage (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.4.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       marcel (~> 1.0)
-    activesupport (7.1.4)
+    activesupport (7.1.4.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -601,7 +601,7 @@ GEM
       actionmailer (>= 3)
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
-    propshaft (1.0.1)
+    propshaft (1.1.0)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
@@ -638,20 +638,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.4)
+    rails (7.1.4.1)
-      actioncable (= 7.1.4)
+      actioncable (= 7.1.4.1)
-      actionmailbox (= 7.1.4)
+      actionmailbox (= 7.1.4.1)
-      actionmailer (= 7.1.4)
+      actionmailer (= 7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      actiontext (= 7.1.4)
+      actiontext (= 7.1.4.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.4.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.4.1)
-      activemodel (= 7.1.4)
+      activemodel (= 7.1.4.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.4.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.4)
+      railties (= 7.1.4.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -666,9 +666,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.4)
+    railties (7.1.4.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.4.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.4.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -698,7 +698,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.7)
+    rexml (3.3.8)
     rotp (6.3.0)
     rouge (4.3.0)
     rpam2 (4.0.2)
@@ -748,15 +748,15 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-performance (1.21.1)
+    rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.25.1)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.0.4)
+    rubocop-rspec (3.0.5)
       rubocop (~> 1.61)
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
@@ -884,7 +884,7 @@ GEM
     webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
-    webmock (3.23.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

app/controllers/api/v1/accounts/exclude_antennas_controller.rb

@@ -6,7 +6,7 @@ class Api::V1::Accounts::ExcludeAntennasController < Api::BaseController
   before_action :set_account
 
   def index
-    @antennas = @account.suspended? ? [] : current_account.antennas.where('exclude_accounts @> \'[?]\'', @account.id)
+    @antennas = @account.suspended? ? [] : current_account.antennas.where("exclude_accounts @> '#{@account.id}'")
     render json: @antennas, each_serializer: REST::AntennaSerializer
   end
 

app/controllers/api/v1/notifications/requests_controller.rb

@@ -52,7 +52,7 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
   private
 
   def load_requests
-    requests = NotificationRequest.where(account: current_account).includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
+    requests = NotificationRequest.where(account: current_account).without_suspended.includes(:last_status, from_account: [:account_stat, :user]).to_a_paginated_by_id(
       limit_param(DEFAULT_ACCOUNTS_LIMIT),
       params_slice(:max_id, :since_id, :min_id)
     )

app/controllers/api/v1/statuses/translations_controller.rb

@@ -23,6 +23,6 @@ class Api::V1::Statuses::TranslationsController < Api::V1::Statuses::BaseControl
   private
 
   def set_translation
-    @translation = TranslateStatusService.new.call(@status, content_locale)
+    @translation = TranslateStatusService.new.call(@status, I18n.locale.to_s)
   end
 end

app/controllers/concerns/web_app_controller_concern.rb

@@ -13,7 +13,7 @@ module WebAppControllerConcern
       policy = ContentSecurityPolicy.new
 
       if policy.sso_host.present?
-        p.form_action policy.sso_host
+        p.form_action policy.sso_host, -> { "https://#{request.host}/auth/auth/" }
       else
         p.form_action :none
       end

app/controllers/settings/two_factor_authentication/otp_authentication_controller.rb

@@ -15,7 +15,7 @@ module Settings
       end
 
       def create
-        session[:new_otp_secret] = User.generate_otp_secret(32)
+        session[:new_otp_secret] = User.generate_otp_secret
 
         redirect_to new_settings_two_factor_authentication_confirmation_path
       end

app/controllers/well_known/host_meta_controller.rb

@@ -7,7 +7,23 @@ module WellKnown
     def show
       @webfinger_template = "#{webfinger_url}?resource={uri}"
       expires_in 3.days, public: true
-      render content_type: 'application/xrd+xml', formats: [:xml]
+
+      respond_to do |format|
+        format.any do
+          render content_type: 'application/xrd+xml', formats: [:xml]
+        end
+
+        format.json do
+          render json: {
+            links: [
+              {
+                rel: 'lrdd',
+                template: @webfinger_template,
+              },
+            ],
+          }
+        end
+      end
     end
   end
 end

app/helpers/admin/action_logs_helper.rb

@@ -37,4 +37,11 @@ module Admin::ActionLogsHelper
       end
     end
   end
+
+  def sorted_action_log_types
+    Admin::ActionLogFilter::ACTION_TYPE_MAP
+      .keys
+      .map { |key| [I18n.t("admin.action_logs.action_types.#{key}"), key] }
+      .sort_by(&:first)
+  end
 end

app/helpers/admin/dashboard_helper.rb

@@ -18,6 +18,11 @@ module Admin::DashboardHelper
     end
   end
 
+  def date_range(range)
+    [l(range.first), l(range.last)]
+      .join(' - ')
+  end
+
   def relevant_account_timestamp(account)
     timestamp, exact = if account.user_current_sign_in_at && account.user_current_sign_in_at < 24.hours.ago
                          [account.user_current_sign_in_at, true]
@@ -25,6 +30,8 @@ module Admin::DashboardHelper
                          [account.user_current_sign_in_at, false]
                        elsif account.user_pending?
                          [account.user_created_at, true]
+                       elsif account.suspended_at.present? && account.local? && account.user.nil?
+                         [account.suspended_at, true]
                        elsif account.last_status_at.present?
                          [account.last_status_at, true]
                        else

app/helpers/application_helper.rb

@@ -3,12 +3,6 @@
 module ApplicationHelper
   include RegistrationLimitationHelper
 
-  DANGEROUS_SCOPES = %w(
-    read
-    write
-    follow
-  ).freeze
-
   RTL_LOCALES = %i(
     ar
     ckb
@@ -97,8 +91,11 @@ module ApplicationHelper
     Rails.env.production? ? site_title : "#{site_title} (Dev)"
   end
 
-  def class_for_scope(scope)
+  def label_for_scope(scope)
-    'scope-danger' if DANGEROUS_SCOPES.include?(scope.to_s)
+    safe_join [
+      tag.samp(scope, class: { 'scope-danger' => SessionActivation::DEFAULT_SCOPES.include?(scope.to_s) }),
+      tag.span(t("doorkeeper.scopes.#{scope}"), class: :hint),
+    ]
   end
 
   def can?(action, record)
@@ -266,6 +263,15 @@ module ApplicationHelper
     current_account&.user&.custom_css&.updated_at.to_s
   end
 
+  def copyable_input(options = {})
+    tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options)
+  end
+
+  def recent_tag_usage(tag)
+    people = tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
+    I18n.t 'user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people
+  end
+
   private
 
   def storage_host_var

app/helpers/webfinger_helper.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module WebfingerHelper
-  def webfinger!(uri)
-    Webfinger.new(uri).perform
-  end
-end

app/javascript/mastodon/actions/markers.ts

@@ -37,8 +37,7 @@ export const synchronouslySubmitMarkers = createAppAsyncThunk(
       });
 
       return;
-      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    } else if ('sendBeacon' in navigator) {
-    } else if ('navigator' && 'sendBeacon' in navigator) {
       // Failing that, we can use sendBeacon, but we have to encode the data as
       // FormData for DoorKeeper to recognize the token.
       const formData = new FormData();

app/javascript/mastodon/actions/notification_groups.ts

@@ -8,6 +8,7 @@ import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
 import type {
   ApiNotificationGroupJSON,
   ApiNotificationJSON,
+  NotificationType,
 } from 'mastodon/api_types/notifications';
 import { allNotificationTypes } from 'mastodon/api_types/notifications';
 import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
@@ -15,6 +16,7 @@ import { usePendingItems } from 'mastodon/initial_state';
 import type { NotificationGap } from 'mastodon/reducers/notification_groups';
 import {
   selectSettingsNotificationsExcludedTypes,
+  selectSettingsNotificationsGroupFollows,
   selectSettingsNotificationsQuickFilterActive,
   selectSettingsNotificationsShows,
 } from 'mastodon/selectors/settings';
@@ -68,17 +70,19 @@ function dispatchAssociatedRecords(
     dispatch(importFetchedStatuses(fetchedStatuses));
 }
 
-const supportedGroupedNotificationTypes = [
+function selectNotificationGroupedTypes(state: RootState) {
-  'favourite',
+  const types: NotificationType[] = ['favourite', 'reblog', 'emoji_reaction'];
-  'reblog',
+
-  'emoji_reaction',
+  if (selectSettingsNotificationsGroupFollows(state)) types.push('follow');
-];
+
+  return types;
+}
 
 export const fetchNotifications = createDataLoadingThunk(
   'notificationGroups/fetch',
   async (_params, { getState }) =>
     apiFetchNotificationGroups({
-      grouped_types: supportedGroupedNotificationTypes,
+      grouped_types: selectNotificationGroupedTypes(getState()),
       exclude_types: getExcludedTypes(getState()),
     }),
   ({ notifications, accounts, statuses }, { dispatch }) => {
@@ -102,7 +106,7 @@ export const fetchNotificationsGap = createDataLoadingThunk(
   'notificationGroups/fetchGap',
   async (params: { gap: NotificationGap }, { getState }) =>
     apiFetchNotificationGroups({
-      grouped_types: supportedGroupedNotificationTypes,
+      grouped_types: selectNotificationGroupedTypes(getState()),
       max_id: params.gap.maxId,
       exclude_types: getExcludedTypes(getState()),
     }),
@@ -119,7 +123,7 @@ export const pollRecentNotifications = createDataLoadingThunk(
   'notificationGroups/pollRecentNotifications',
   async (_params, { getState }) => {
     return apiFetchNotificationGroups({
-      grouped_types: supportedGroupedNotificationTypes,
+      grouped_types: selectNotificationGroupedTypes(getState()),
       max_id: undefined,
       exclude_types: getExcludedTypes(getState()),
       // In slow mode, we don't want to include notifications that duplicate the already-displayed ones
@@ -168,7 +172,10 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
     dispatchAssociatedRecords(dispatch, [notification]);
 
-    return notification;
+    return {
+      notification,
+      groupedTypes: selectNotificationGroupedTypes(state),
+    };
   },
 );
 

app/javascript/mastodon/api_types/accounts.ts

@@ -39,7 +39,7 @@ export interface ApiServerFeaturesJSON {
 }
 
 // See app/serializers/rest/account_serializer.rb
-export interface ApiAccountJSON {
+export interface BaseApiAccountJSON {
   acct: string;
   avatar: string;
   avatar_static: string;
@@ -74,3 +74,12 @@ export interface ApiAccountJSON {
   memorial?: boolean;
   hide_collections: boolean;
 }
+
+// See app/serializers/rest/muted_account_serializer.rb
+export interface ApiMutedAccountJSON extends BaseApiAccountJSON {
+  mute_expires_at?: string | null;
+}
+
+// For now, we have the same type representing both `Account` and `MutedAccount`
+// objects, but we should refactor this in the future.
+export type ApiAccountJSON = ApiMutedAccountJSON;

app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap

@@ -2,7 +2,7 @@
 
 exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
 <div
-  className="account__avatar"
+  className="account__avatar account__avatar--loading"
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
   style={
@@ -14,6 +14,8 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
 >
   <img
     alt=""
+    onError={[Function]}
+    onLoad={[Function]}
     src="/animated/alice.gif"
   />
 </div>
@@ -21,7 +23,7 @@ exports[`<Avatar /> Autoplay renders a animated avatar 1`] = `
 
 exports[`<Avatar /> Still renders a still avatar 1`] = `
 <div
-  className="account__avatar"
+  className="account__avatar account__avatar--loading"
   onMouseEnter={[Function]}
   onMouseLeave={[Function]}
   style={
@@ -33,6 +35,8 @@ exports[`<Avatar /> Still renders a still avatar 1`] = `
 >
   <img
     alt=""
+    onError={[Function]}
+    onLoad={[Function]}
     src="/static/alice.jpg"
   />
 </div>

app/javascript/mastodon/components/avatar.tsx

@@ -1,10 +1,11 @@
+import { useState, useCallback } from 'react';
+
 import classNames from 'classnames';
 
+import { useHovering } from 'mastodon/../hooks/useHovering';
+import { autoPlayGif } from 'mastodon/initial_state';
 import type { Account } from 'mastodon/models/account';
 
-import { useHovering } from '../../hooks/useHovering';
-import { autoPlayGif } from '../initial_state';
-
 interface Props {
   account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there
   size: number;
@@ -25,6 +26,8 @@ export const Avatar: React.FC<Props> = ({
   counterBorderColor,
 }) => {
   const { hovering, handleMouseEnter, handleMouseLeave } = useHovering(animate);
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(false);
 
   const style = {
     ...styleFromParent,
@@ -37,16 +40,28 @@ export const Avatar: React.FC<Props> = ({
       ? account?.get('avatar')
       : account?.get('avatar_static');
 
+  const handleLoad = useCallback(() => {
+    setLoading(false);
+  }, [setLoading]);
+
+  const handleError = useCallback(() => {
+    setError(true);
+  }, [setError]);
+
   return (
     <div
       className={classNames('account__avatar', {
-        'account__avatar-inline': inline,
+        'account__avatar--inline': inline,
+        'account__avatar--loading': loading,
       })}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
       style={style}
     >
-      {src && <img src={src} alt='' />}
+      {src && !error && (
+        <img src={src} alt='' onLoad={handleLoad} onError={handleError} />
+      )}
+
       {counter && (
         <div
           className='account__avatar__counter'

app/javascript/mastodon/components/media_gallery.jsx

@@ -212,7 +212,7 @@ class Item extends PureComponent {
 
         {visible && thumbnail}
 
-        {badges && (
+        {visible && badges && (
           <div className='media-gallery__item__badges'>
             {badges}
           </div>
@@ -366,14 +366,14 @@ class MediaGallery extends PureComponent {
 
     return (
       <div className={classNames(classList)} style={style} ref={this.handleRef}>
+        {children}
+        
         {(!visible || uncached) && (
           <div className={classNames('spoiler-button', { 'spoiler-button--click-thru': uncached })}>
             {spoilerButton}
           </div>
         )}
 
-        {children}
-
         {(visible && !uncached) && (
           <div className='media-gallery__actions'>
             <button className='media-gallery__actions__pill' onClick={this.handleOpen}><FormattedMessage id='media_gallery.hide' defaultMessage='Hide' /></button>

app/javascript/mastodon/components/status_action_bar.jsx

@@ -11,7 +11,6 @@ import { connect } from 'react-redux';
 
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
-import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@@ -166,8 +165,6 @@ class StatusActionBar extends ImmutablePureComponent {
     }
   };
 
-  handleEmojiPickInnerButton = () => {};
-
   handleReblogClick = e => {
     const { signedIn } = this.props.identity;
 
@@ -323,7 +320,7 @@ class StatusActionBar extends ImmutablePureComponent {
         menu.push({ text: intl.formatMessage(messages.share), action: this.handleShareClick });
       }
 
-      if (anonymousStatus && (signedIn || !isRemote)) {
+      if (anonymousStatus && !isRemote) {
         menu.push({ text: intl.formatMessage(messages.embed), action: this.handleEmbed });
       }
     }
@@ -485,9 +482,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
     const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
       <div className='status__action-bar__button-wrapper'>
-        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
+        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} inverted={false} />
-          <IconButton icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
-        )} />
       </div>
     )) || (enableEmojiReaction && (
       <div className='status__action-bar__button-wrapper status__action-bar__button-wrapper__blank' />

app/javascript/mastodon/containers/compose_container.jsx

@@ -1,5 +1,6 @@
 import { Provider } from 'react-redux';
 
+import { fetchCircles } from 'mastodon/actions/circles';
 import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
 import { hydrateStore } from 'mastodon/actions/store';
 import { Router } from 'mastodon/components/router';
@@ -13,6 +14,7 @@ if (initialState) {
 }
 
 store.dispatch(fetchCustomEmojis());
+store.dispatch(fetchCircles());
 
 const ComposeContainer = () => (
   <IntlProvider>

app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.jsx

@@ -325,6 +325,7 @@ class EmojiPickerDropdown extends PureComponent {
     onPickEmoji: PropTypes.func.isRequired,
     onSkinTone: PropTypes.func.isRequired,
     skinTone: PropTypes.number.isRequired,
+    inverted: PropTypes.bool,
   };
 
   state = {
@@ -387,7 +388,7 @@ class EmojiPickerDropdown extends PureComponent {
   };
 
   render () {
-    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
+    const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis, inverted } = this.props;
     const title = intl.formatMessage(messages.emoji);
     const { active, loading, placement } = this.state;
 
@@ -399,7 +400,7 @@ class EmojiPickerDropdown extends PureComponent {
           active={active}
           iconComponent={MoodIcon}
           onClick={this.onToggle}
-          inverted
+          inverted={typeof(inverted) === 'undefined' || inverted}
         />
 
         <Overlay show={active} placement={placement} flip target={this.findTarget} popperConfig={{ strategy: 'fixed', onFirstUpdate: this.handleOverlayEnter }}>

app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.jsx

@@ -129,8 +129,13 @@ export const InlineFollowSuggestions = ({ hidden }) => {
       return;
     }
 
-    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    if (getComputedStyle(bodyRef.current).direction === 'rtl') {
-    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+      setCanScrollLeft((bodyRef.current.clientWidth - bodyRef.current.scrollLeft) < bodyRef.current.scrollWidth);
+      setCanScrollRight(bodyRef.current.scrollLeft < 0);
+    } else {
+      setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+      setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+    }
   }, [setCanScrollRight, setCanScrollLeft, bodyRef, suggestions]);
 
   const handleLeftNav = useCallback(() => {
@@ -146,8 +151,13 @@ export const InlineFollowSuggestions = ({ hidden }) => {
       return;
     }
 
-    setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+    if (getComputedStyle(bodyRef.current).direction === 'rtl') {
-    setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+      setCanScrollLeft((bodyRef.current.clientWidth - bodyRef.current.scrollLeft) < bodyRef.current.scrollWidth);
+      setCanScrollRight(bodyRef.current.scrollLeft < 0);
+    } else {
+      setCanScrollLeft(bodyRef.current.scrollLeft > 0);
+      setCanScrollRight((bodyRef.current.scrollLeft + bodyRef.current.clientWidth) < bodyRef.current.scrollWidth);
+    }
   }, [setCanScrollRight, setCanScrollLeft, bodyRef]);
 
   const handleDismiss = useCallback(() => {

app/javascript/mastodon/features/notifications/components/column_settings.jsx

@@ -44,6 +44,7 @@ class ColumnSettings extends PureComponent {
     const alertStr = <FormattedMessage id='notifications.column_settings.alert' defaultMessage='Desktop notifications' />;
     const showStr = <FormattedMessage id='notifications.column_settings.show' defaultMessage='Show in column' />;
     const soundStr = <FormattedMessage id='notifications.column_settings.sound' defaultMessage='Play sound' />;
+    const groupStr = <FormattedMessage id='notifications.column_settings.group' defaultMessage='Group' />;
 
     const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
     const pushStr = showPushSettings && <FormattedMessage id='notifications.column_settings.push' defaultMessage='Push notifications' />;
@@ -100,6 +101,7 @@ class ColumnSettings extends PureComponent {
             {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'follow']} onChange={this.onPushChange} label={pushStr} />}
             <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'follow']} onChange={onChange} label={showStr} />
             <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'follow']} onChange={onChange} label={soundStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['group', 'follow']} onChange={onChange} label={groupStr} />
           </div>
         </section>
 

app/javascript/mastodon/features/notifications/containers/column_settings_container.js

@@ -56,11 +56,12 @@ const mapDispatchToProps = (dispatch) => ({
       } else {
         dispatch(changeSetting(['notifications', ...path], checked));
       }
-    } else if(path[0] === 'groupingBeta') {
-      dispatch(changeSetting(['notifications', ...path], checked));
-      dispatch(initializeNotifications());
     } else {
       dispatch(changeSetting(['notifications', ...path], checked));
+
+      if(path[0] === 'group' && path[1] === 'follow') {
+        dispatch(initializeNotifications());
+      }
     }
   },
 

app/javascript/mastodon/features/notifications_v2/components/notification_follow.tsx

@@ -1,16 +1,19 @@
 import { FormattedMessage } from 'react-intl';
 
+import { Link } from 'react-router-dom';
+
 import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import { FollowersCounter } from 'mastodon/components/counters';
 import { FollowButton } from 'mastodon/components/follow_button';
 import { ShortNumber } from 'mastodon/components/short_number';
+import { me } from 'mastodon/initial_state';
 import type { NotificationGroupFollow } from 'mastodon/models/notification_group';
 import { useAppSelector } from 'mastodon/store';
 
 import type { LabelRenderer } from './notification_group_with_status';
 import { NotificationGroupWithStatus } from './notification_group_with_status';
 
-const labelRenderer: LabelRenderer = (displayedName, total) => {
+const labelRenderer: LabelRenderer = (displayedName, total, seeMoreHref) => {
   if (total === 1)
     return (
       <FormattedMessage
@@ -23,10 +26,12 @@ const labelRenderer: LabelRenderer = (displayedName, total) => {
   return (
     <FormattedMessage
       id='notification.follow.name_and_others'
-      defaultMessage='{name} and {count, plural, one {# other} other {# others}} followed you'
+      defaultMessage='{name} and <a>{count, plural, one {# other} other {# others}}</a> followed you'
       values={{
         name: displayedName,
         count: total - 1,
+        a: (chunks) =>
+          seeMoreHref ? <Link to={seeMoreHref}>{chunks}</Link> : chunks,
       }}
     />
   );
@@ -37,8 +42,14 @@ const FollowerCount: React.FC<{ accountId: string }> = ({ accountId }) => {
 
   if (!account) return null;
 
+  const isHide = account.other_settings.hide_followers_count;
+
   return (
-    <ShortNumber value={account.followers_count} renderer={FollowersCounter} />
+    <ShortNumber
+      value={account.followers_count}
+      renderer={FollowersCounter}
+      isHide={isHide}
+    />
   );
 };
 
@@ -46,6 +57,10 @@ export const NotificationFollow: React.FC<{
   notification: NotificationGroupFollow;
   unread: boolean;
 }> = ({ notification, unread }) => {
+  const username = useAppSelector(
+    (state) => state.accounts.getIn([me, 'username']) as string,
+  );
+
   let actions: JSX.Element | undefined;
   let additionalContent: JSX.Element | undefined;
 
@@ -68,6 +83,7 @@ export const NotificationFollow: React.FC<{
       timestamp={notification.latest_page_notification_at}
       count={notification.notifications_count}
       labelRenderer={labelRenderer}
+      labelSeeMoreHref={`/@${username}/followers`}
       unread={unread}
       actions={actions}
       additionalContent={additionalContent}

app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx

@@ -13,6 +13,7 @@ import {
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import Status from 'mastodon/containers/status_container';
+import { getStatusHidden } from 'mastodon/selectors/filters';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { DisplayedName } from './displayed_name';
@@ -50,6 +51,12 @@ export const NotificationWithStatus: React.FC<{
     (state) => state.statuses.getIn([statusId, 'visibility']) === 'direct',
   );
 
+  const isFiltered = useAppSelector(
+    (state) =>
+      statusId &&
+      getStatusHidden(state, { id: statusId, contextType: 'notifications' }),
+  );
+
   const handlers = useMemo(
     () => ({
       open: () => {
@@ -75,7 +82,7 @@ export const NotificationWithStatus: React.FC<{
     [dispatch, statusId],
   );
 
-  if (!statusId) return null;
+  if (!statusId || isFiltered) return null;
 
   return (
     <HotKeys handlers={handlers}>

app/javascript/mastodon/features/picture_in_picture/components/footer.jsx

@@ -14,6 +14,8 @@ import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
 import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
@@ -159,22 +161,26 @@ class Footer extends ImmutablePureComponent {
       replyTitle = intl.formatMessage(messages.replyAll);
     }
 
-    let reblogTitle = '';
+    let reblogTitle, reblogIconComponent;
 
     if (status.get('reblogged')) {
       reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
+      reblogIconComponent = publicStatus ? RepeatIcon : RepeatPrivateIcon;
     } else if (publicStatus) {
       reblogTitle = intl.formatMessage(messages.reblog);
+      reblogIconComponent = RepeatIcon;
     } else if (reblogPrivate) {
       reblogTitle = intl.formatMessage(messages.reblog_private);
+      reblogIconComponent = RepeatPrivateIcon;
     } else {
       reblogTitle = intl.formatMessage(messages.cannot_reblog);
+      reblogIconComponent = RepeatDisabledIcon;
     }
 
     return (
       <div className='picture-in-picture__footer'>
         <IconButton className='status__action-bar-button' title={replyTitle} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} iconComponent={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? ReplyIcon : replyIconComponent} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
-        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={RepeatIcon} onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
+        <IconButton className={classNames('status__action-bar-button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate}  active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={status.get('reblogs_count')} />
         <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' iconComponent={StarIcon} onClick={this.handleFavouriteClick} counter={status.get('favourites_count')} />
         {withOpenButton && <IconButton className='status__action-bar-button' title={intl.formatMessage(messages.open)} icon='external-link' iconComponent={OpenInNewIcon} onClick={this.handleOpenClick} href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} />}
       </div>

app/javascript/mastodon/features/status/components/action_bar.jsx

@@ -11,7 +11,6 @@ import { connect } from 'react-redux';
 
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
-import EmojiReactionIcon from '@/material-icons/400-24px/mood.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
@@ -232,8 +231,6 @@ class ActionBar extends PureComponent {
     this.props.onEmojiReact(this.props.status, data);
   };
 
-  handleEmojiPickInnerButton = () => {};
-
   render () {
     const { status, relationship, intl } = this.props;
     const { signedIn, permissions } = this.props.identity;
@@ -401,9 +398,7 @@ class ActionBar extends PureComponent {
     const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
     const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
       <div className='detailed-status__button'>
-        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
+        <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} inverted={false} />
-          <IconButton title={intl.formatMessage(messages.pickEmoji)} icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
-        )} />
       </div>
     )) || (enableEmojiReaction && (
       <div className='detailed-status__button__blank' />

app/javascript/mastodon/features/ui/components/mute_modal.jsx

@@ -116,6 +116,7 @@ export const MuteModal = ({ accountId, acct }) => {
         <div className='safety-action-modal__bottom__collapsible'>
           <div className='safety-action-modal__field-group'>
             <RadioButtonLabel name='duration' value='0' label={intl.formatMessage(messages.indefinite)} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
+            <RadioButtonLabel name='duration' value='21600' label={intl.formatMessage(messages.hours, { number: 6 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='86400' label={intl.formatMessage(messages.hours, { number: 24 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='604800' label={intl.formatMessage(messages.days, { number: 7 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />
             <RadioButtonLabel name='duration' value='2592000' label={intl.formatMessage(messages.days, { number: 30 })} currentValue={muteDuration} onChange={handleChangeMuteDuration} />

app/javascript/mastodon/locales/ar.json

@@ -84,6 +84,7 @@
   "alert.rate_limited.title": "معدل الطلبات محدود",
   "alert.unexpected.message": "لقد طرأ خطأ غير متوقّع.",
   "alert.unexpected.title": "المعذرة!",
+  "alt_text_badge.title": "نص بديل",
   "announcement.announcement": "إعلان",
   "attachments_list.unprocessed": "(غير معالَج)",
   "audio.hide": "إخفاء المقطع الصوتي",
@@ -758,7 +759,7 @@
   "status.history.edited": "عدله {name} {date}",
   "status.load_more": "حمّل المزيد",
   "status.media.open": "اضغط للفتح",
-  "status.media.show": "اضغط لإظهاره",
+  "status.media.show": "اضغط لإظهارها",
   "status.media_hidden": "وسائط مخفية",
   "status.mention": "أذكُر @{name}",
   "status.more": "المزيد",

app/javascript/mastodon/locales/ast.json

@@ -29,7 +29,7 @@
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
-  "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
+  "account.hide_reblogs": "Esconder los artículos compartíos de @{name}",
   "account.in_memoriam": "N'alcordanza.",
   "account.joined_short": "Data de xunión",
   "account.link_verified_on": "La propiedá d'esti enllaz comprobóse'l {date}",
@@ -122,6 +122,7 @@
   "conversation.open": "Ver la conversación",
   "conversation.with": "Con {names}",
   "copypaste.copied": "Copióse",
+  "copypaste.copy_to_clipboard": "Copiar nel cartafueyu",
   "directory.federated": "Del fediversu conocíu",
   "directory.local": "De «{domain}» namás",
   "directory.new_arrivals": "Cuentes nueves",
@@ -130,7 +131,7 @@
   "dismissable_banner.dismiss": "Escartar",
   "dismissable_banner.explore_tags": "Esta seición contién les etiquetes del fediversu que tán ganando popularidá güei. Les etiquetes más usaes polos perfiles apaecen no cimero.",
   "dismissable_banner.public_timeline": "Esta seición contién los artículos más nuevos de les persones na web social que les persones de {domain} siguen.",
-  "embed.instructions": "Empotra esti artículu nel to sitiu web pente la copia del códigu d'abaxo.",
+  "embed.instructions": "Empotra esti artículu nel to sitiu web copiando'l códigu d'abaxo.",
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
   "emoji_button.flags": "Banderes",
@@ -251,7 +252,7 @@
   "keyboard_shortcuts.requests": "Abrir la llista de solicitúes de siguimientu",
   "keyboard_shortcuts.search": "Enfocar la barra de busca",
   "keyboard_shortcuts.start": "Abrir la columna «Entamar»",
-  "keyboard_shortcuts.toggle_sensitivity": "Amosar/anubrir el conteníu multimedia",
+  "keyboard_shortcuts.toggle_sensitivity": "Amosar/esconder el conteníu multimedia",
   "keyboard_shortcuts.toot": "Comenzar un artículu nuevu",
   "keyboard_shortcuts.unfocus": "Desenfocar l'área de composición/busca",
   "keyboard_shortcuts.up": "Xubir na llista",
@@ -299,6 +300,7 @@
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
   "notifications.column_settings.follow": "Siguidores nuevos:",
   "notifications.column_settings.follow_request": "Solicitúes de siguimientu nueves:",
+  "notifications.column_settings.group": "Agrupar",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultaos de les encuestes:",
   "notifications.column_settings.reblog": "Artículos compartíos:",
@@ -418,11 +420,12 @@
   "status.direct": "Mentar a @{name} per privao",
   "status.direct_indicator": "Mención privada",
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
+  "status.embed": "Consiguir el códigu pa empotrar",
   "status.filter": "Peñerar esti artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
-  "status.media_hidden": "Conteníu multimedia anubríu",
+  "status.media_hidden": "Conteníu multimedia escondíu",
   "status.mention": "Mentar a @{name}",
   "status.more": "Más",
   "status.mute": "Desactivar los avisos de @{name}",
@@ -468,14 +471,14 @@
   "upload_modal.applying": "Aplicando…",
   "upload_modal.detect_text": "Detectar el testu de la semeya",
   "upload_modal.edit_media": "Edición",
-  "upload_modal.hint": "Calca o arrastra'l círculu de la previsualización pa escoyer el puntu d'enfoque que siempres va tar a la vista en toles miniatures.",
+  "upload_modal.hint": "Calca o arrastra'l círculu de la previsualización pa escoyer el puntu d'enfoque que siempre va tar a la vista en toles miniatures.",
   "upload_progress.label": "Xubiendo…",
   "upload_progress.processing": "Procesando…",
   "video.close": "Zarrar el videu",
   "video.download": "Baxar el ficheru",
   "video.expand": "Espander el videu",
   "video.fullscreen": "Pantalla completa",
-  "video.hide": "Anubrir el videu",
+  "video.hide": "Esconder el videu",
   "video.mute": "Desactivar el soníu",
   "video.pause": "Posar",
   "video.play": "Reproducir",

app/javascript/mastodon/locales/be.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": "Схаваць аўдыя",

app/javascript/mastodon/locales/bg.json

@@ -490,7 +490,6 @@
   "notification.favourite": "{name} направи любима публикацията ви",
   "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a> направиха любима ваша публикация",
   "notification.follow": "{name} ви последва",
-  "notification.follow.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} ви последваха",
   "notification.follow_request": "{name} поиска да ви последва",
   "notification.follow_request.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} поискаха да ви последват",
   "notification.label.mention": "Споменаване",

app/javascript/mastodon/locales/br.json

@@ -385,6 +385,7 @@
   "notification.admin.report": "Disklêriet eo bet {target} gant {name}",
   "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
+  "notification.follow.name_and_others": "{name} <a>{count, plural, one {hag # den all} two {ha # zen all} few {ha # den all} many {ha # den all} other {ha # den all}}</a> zo o heuliañ ac'hanoc'h",
   "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
@@ -399,6 +400,7 @@
   "notifications.column_settings.favourite": "Muiañ-karet:",
   "notifications.column_settings.follow": "Heulierien nevez:",
   "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
+  "notifications.column_settings.group": "Strollañ",
   "notifications.column_settings.mention": "Menegoù:",
   "notifications.column_settings.poll": "Disoc'hoù ar sontadeg:",
   "notifications.column_settings.push": "Kemennoù push",

app/javascript/mastodon/locales/ca.json

@@ -508,7 +508,6 @@
   "notification.favourite": "{name} ha afavorit el teu tut",
   "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han afavorit la vostra publicació",
   "notification.follow": "{name} et segueix",
-  "notification.follow.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} us han seguit",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.follow_request.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} han demanat de seguir-vos",
   "notification.label.mention": "Menció",
@@ -516,6 +515,7 @@
   "notification.label.private_reply": "Resposta en privat",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menció",
+  "notification.mentioned_you": "{name} us ha mencionat",
   "notification.moderation-warning.learn_more": "Per a saber-ne més",
   "notification.moderation_warning": "Heu rebut un avís de moderació",
   "notification.moderation_warning.action_delete_statuses": "S'han eliminat algunes de les vostres publicacions.",

app/javascript/mastodon/locales/cy.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Cyfradd gyfyngedig",
   "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
   "alert.unexpected.title": "Wps!",
+  "alt_text_badge.title": "Testun Amgen",
   "announcement.announcement": "Cyhoeddiad",
   "attachments_list.unprocessed": "(heb eu prosesu)",
   "audio.hide": "Cuddio sain",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
   "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
   "domain_block_modal.title": "Blocio parth?",
+  "domain_block_modal.you_will_lose_num_followers": "Byddwch yn colli {followersCount, plural, one {{followersCountDisplay} dilynwr} other {{followersCountDisplay} dilynwyr}} a {followingCount, plural, one {{followingCountDisplay} person rydych yn dilyn} other {{followingCountDisplay} o bobl rydych yn eu dilyn}}.",
+  "domain_block_modal.you_will_lose_relationships": "Byddwch yn colli'r holl ddilynwyr a phobl rydych chi'n eu dilyn o'r gweinydd hwn.",
   "domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
   "domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
   "domain_pill.activitypub_like_language": "Mae ActivityPub fel yr iaith y mae Mastodon yn ei siarad â rhwydweithiau cymdeithasol eraill.",
@@ -505,7 +508,7 @@
   "notification.favourite": "Ffafriodd {name} eich postiad",
   "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
   "notification.follow": "Dilynodd {name} chi",
-  "notification.follow.name_and_others": "Mae {name} a {count, plural, one {# other} other {# others}} wedi'ch dilyn chi",
+  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# other} two {# others} few {# others} many {# others} other {# others}}</a> nawr yn eich dilyn chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
   "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# other} other {# others}} wedi gofyn i'ch dilyn chi",
   "notification.label.mention": "Crybwyll",
@@ -513,6 +516,7 @@
   "notification.label.private_reply": "Ateb preifat",
   "notification.label.reply": "Ateb",
   "notification.mention": "Crybwyll",
+  "notification.mentioned_you": "Rydych wedi'ch crybwyll gan {name}",
   "notification.moderation-warning.learn_more": "Dysgu mwy",
   "notification.moderation_warning": "Rydych wedi derbyn rhybudd gan gymedrolwr",
   "notification.moderation_warning.action_delete_statuses": "Mae rhai o'ch postiadau wedi'u dileu.",
@@ -563,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Bar hidlo cyflym",
   "notifications.column_settings.follow": "Dilynwyr newydd:",
   "notifications.column_settings.follow_request": "Ceisiadau dilyn newydd:",
+  "notifications.column_settings.group": "Grŵp",
   "notifications.column_settings.mention": "Crybwylliadau:",
   "notifications.column_settings.poll": "Canlyniadau pleidlais:",
   "notifications.column_settings.push": "Hysbysiadau gwthiadwy",
@@ -849,6 +854,11 @@
   "upload_error.poll": "Nid oes modd llwytho ffeiliau â phleidleisiau.",
   "upload_form.audio_description": "Disgrifio ar gyfer pobl sydd â cholled clyw",
   "upload_form.description": "Disgrifio i'r rheini a nam ar ei golwg",
+  "upload_form.drag_and_drop.instructions": "I godi atodiad cyfryngau, pwyswch y space neu enter. Wrth lusgo, defnyddiwch y bysellau saeth i symud yr atodiad cyfryngau i unrhyw gyfeiriad penodol. Pwyswch space neu enter eto i ollwng yr atodiad cyfryngau yn ei safle newydd, neu pwyswch escape i ddiddymu.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Cafodd llusgo ei ddiddymu. Cafodd atodiad cyfryngau {item} ei ollwng.",
+  "upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
+  "upload_form.drag_and_drop.on_drag_over": "Symudwyd atodiad cyfryngau {item}.",
+  "upload_form.drag_and_drop.on_drag_start": "Atodiad cyfryngau godwyd {item}.",
   "upload_form.edit": "Golygu",
   "upload_form.thumbnail": "Newid llun bach",
   "upload_form.video_description": "Disgrifio ar gyfer pobl sydd â cholled clyw neu amhariad golwg",

app/javascript/mastodon/locales/da.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> gjorde dit indlæg til favorit",
   "notification.follow": "{name} begyndte at følge dig",
-  "notification.follow.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} følger dig",
+  "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# andre} other {# andre}}</a> begyndte at følge dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
   "notification.follow_request.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} har anmodet om at følger dig",
   "notification.label.mention": "Omtale",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Privat svar",
   "notification.label.reply": "Besvar",
   "notification.mention": "Omtale",
+  "notification.mentioned_you": "{name} nævnte dig",
   "notification.moderation-warning.learn_more": "Læs mere",
   "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
   "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
+  "notifications.column_settings.group": "Gruppere",
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
   "notifications.column_settings.push": "Push-notifikationer",

app/javascript/mastodon/locales/de.json

@@ -41,7 +41,7 @@
   "account.go_to_profile": "Profil aufrufen",
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
   "account.in_memoriam": "Zum Andenken.",
-  "account.joined_short": "Beigetreten",
+  "account.joined_short": "Mitglied seit",
   "account.languages": "Ausgewählte Sprachen ändern",
   "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
   "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} favorisierte deinen Beitrag",
   "notification.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> favorisierten deinen Beitrag",
   "notification.follow": "{name} folgt dir",
-  "notification.follow.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} folgen dir",
+  "notification.follow.name_and_others": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> folgen dir",
   "notification.follow_request": "{name} möchte dir folgen",
   "notification.follow_request.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} möchten dir folgen",
   "notification.label.mention": "Erwähnung",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Private Antwort",
   "notification.label.reply": "Antwort",
   "notification.mention": "Erwähnung",
+  "notification.mentioned_you": "{name} erwähnte dich",
   "notification.moderation-warning.learn_more": "Mehr erfahren",
   "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
   "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
@@ -534,7 +535,7 @@
   "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
   "notification.relationships_severance_event.learn_more": "Mehr erfahren",
   "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
-  "notification.status": "{name} hat gerade etwas gepostet",
+  "notification.status": "{name} veröffentlichte gerade",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Genehmigen",
   "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen …} other {# Anfragen genehmigen …}}",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Filterleiste",
   "notifications.column_settings.follow": "Neue Follower:",
   "notifications.column_settings.follow_request": "Neue Follower-Anfragen:",
+  "notifications.column_settings.group": "Gruppieren",
   "notifications.column_settings.mention": "Erwähnungen:",
   "notifications.column_settings.poll": "Umfrageergebnisse:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",

app/javascript/mastodon/locales/el.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": "Απόκρυψη αρχείου ήχου",
@@ -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, one {{followersCountDisplay} ακόλουθο} other {{followersCountDisplay} ακόλουθους}} και {followingCount, plural, one {{followingCountDisplay} άτομο που ακολουθείτε} other {{followingCountDisplay} άτομα που ακολουθείτε}}.",
+  "domain_block_modal.you_will_lose_relationships": "Θα χάσετε όλους τους ακόλουθους και τα άτομα που ακολουθείτε από αυτόν τον διακομιστή.",
   "domain_block_modal.you_wont_see_posts": "Δεν θα βλέπεις αναρτήσεις ή ειδοποιήσεις από χρήστες σε αυτόν το διακομιστή.",
   "domain_pill.activitypub_lets_connect": "Σού επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
   "domain_pill.activitypub_like_language": "Το ActivityPub είναι σαν τη γλώσσα Mastodon μιλάει με άλλα κοινωνικά δίκτυα.",
@@ -505,7 +508,6 @@
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.favourite.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> αγάπησαν την ανάρτησή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
-  "notification.follow.name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}} σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
@@ -849,6 +851,11 @@
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
   "upload_form.audio_description": "Περιγραφή για άτομα με προβλήματα ακοής",
   "upload_form.description": "Περιγραφή για άτομα με προβλήματα όρασης",
+  "upload_form.drag_and_drop.instructions": "Για να επιλέξετε ένα συνημμένο αρχείο πολυμέσων, πατήστε το Space ή το Enter. Ενώ το σέρνετε, χρησιμοποιήστε τα πλήκτρα βέλους για να μετακινήσετε το συνημμένο αρχείο πολυμέσων προς οποιαδήποτε κατεύθυνση. Πατήστε ξανά το Space ή το Enter για να αποθέσετε το συνημμένο αρχείο πολυμέσων στη νέα του θέση ή πατήστε το Escape για ακύρωση.",
+  "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": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",

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

@@ -508,7 +508,6 @@
   "notification.favourite": "{name} favourited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your post",
   "notification.follow": "{name} followed you",
-  "notification.follow.name_and_others": "{name} and {count, plural, one {# other} other {# others}} followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.follow_request.name_and_others": "{name} and {count, plural, one {# other} other {# others}} has requested to follow you",
   "notification.label.mention": "Mention",
@@ -791,7 +790,7 @@
   "status.edited_x_times": "Edited {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Get embed code",
   "status.favourite": "Favourite",
-  "status.favourites": "{count, plural, one {favorite} other {favorites}}",
+  "status.favourites": "{count, plural, one {favourite} other {favourites}}",
   "status.filter": "Filter this post",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
@@ -852,6 +851,11 @@
   "upload_error.poll": "File upload not allowed with polls.",
   "upload_form.audio_description": "Describe for people who are deaf or hard of hearing",
   "upload_form.description": "Describe for people who are blind or have low vision",
+  "upload_form.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
+  "upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",
+  "upload_form.drag_and_drop.on_drag_over": "Media attachment {item} was moved.",
+  "upload_form.drag_and_drop.on_drag_start": "Picked up media attachment {item}.",
   "upload_form.edit": "Edit",
   "upload_form.thumbnail": "Change thumbnail",
   "upload_form.video_description": "Describe for people who are deaf, hard of hearing, blind or have low vision",

app/javascript/mastodon/locales/en.json

@@ -625,7 +625,7 @@
   "notification.favourite": "{name} favorited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post",
   "notification.follow": "{name} followed you",
-  "notification.follow.name_and_others": "{name} and {count, plural, one {# other} other {# others}} followed you",
+  "notification.follow.name_and_others": "{name} and <a>{count, plural, one {# other} other {# others}}</a> followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.follow_request.name_and_others": "{name} and {count, plural, one {# other} other {# others}} has requested to follow you",
   "notification.label.mention": "Mention",
@@ -634,6 +634,7 @@
   "notification.label.reply": "Reply",
   "notification.list_status": "{name} post is added to {listName}",
   "notification.mention": "Mention",
+  "notification.mentioned_you": "{name} mentioned you",
   "notification.moderation-warning.learn_more": "Learn more",
   "notification.moderation_warning": "You have received a moderation warning",
   "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
@@ -687,6 +688,7 @@
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
+  "notifications.column_settings.group": "Group",
   "notifications.column_settings.list_status": "New posts of list:",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",

app/javascript/mastodon/locales/eo.json

@@ -13,7 +13,7 @@
   "about.rules": "Regularo de la servilo",
   "account.account_note_header": "Personaj notoj",
   "account.add_or_remove_from_list": "Aldoni al aŭ forigi el listoj",
-  "account.badges.bot": "Roboto",
+  "account.badges.bot": "Aŭtomata",
   "account.badges.group": "Grupo",
   "account.block": "Bloki @{name}",
   "account.block_domain": "Bloki la domajnon {domain}",
@@ -22,10 +22,10 @@
   "account.cancel_follow_request": "Nuligi peton por sekvado",
   "account.copy": "Kopii ligilon al profilo",
   "account.direct": "Private mencii @{name}",
-  "account.disable_notifications": "Ne plu sciigi min, kiam @{name} mesaĝas",
+  "account.disable_notifications": "Ĉesu sciigi min kiam @{name} afiŝas",
   "account.domain_blocked": "Domajno blokita",
   "account.edit_profile": "Redakti la profilon",
-  "account.enable_notifications": "Sciigi min, kiam @{name} mesaĝas",
+  "account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
   "account.endorse": "Rekomendi ĉe via profilo",
   "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
   "account.featured_tags.last_status_never": "Neniu afiŝo",
@@ -49,14 +49,14 @@
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
-  "account.mute_notifications_short": "Silentigu Sciigojn",
+  "account.mute_notifications_short": "Silentigu sciigojn",
   "account.mute_short": "Silentigu",
   "account.muted": "Silentigita",
   "account.mutual": "Reciproka",
   "account.no_bio": "Neniu priskribo estas provizita.",
   "account.open_original_page": "Malfermi la originalan paĝon",
   "account.posts": "Afiŝoj",
-  "account.posts_with_replies": "Mesaĝoj kaj respondoj",
+  "account.posts_with_replies": "Afiŝoj kaj respondoj",
   "account.report": "Raporti @{name}",
   "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
   "account.requested_follow": "{name} petis sekvi vin",
@@ -69,7 +69,7 @@
   "account.unendorse": "Ne plu rekomendi ĉe la profilo",
   "account.unfollow": "Ĉesi sekvi",
   "account.unmute": "Ne plu silentigi @{name}",
-  "account.unmute_notifications_short": "Malsilentigu Sciigojn",
+  "account.unmute_notifications_short": "Malsilentigu sciigojn",
   "account.unmute_short": "Ne plu silentigi",
   "account_note.placeholder": "Alklaku por aldoni noton",
   "admin.dashboard.daily_retention": "Uzantoretenprocento lau tag post registro",
@@ -81,12 +81,12 @@
   "admin.impact_report.instance_followers": "Sekvantojn niaj uzantoj perdus",
   "admin.impact_report.instance_follows": "Sekvantojn ties uzantoj perdus",
   "admin.impact_report.title": "Influa reporto",
-  "alert.rate_limited.message": "Bonvolu reprovi post {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Bonvolu reprovi poste {retry_time, time, medium}.",
   "alert.rate_limited.title": "Mesaĝkvante limigita",
   "alert.unexpected.message": "Neatendita eraro okazis.",
   "alert.unexpected.title": "Aj!",
   "alt_text_badge.title": "Alt-teksto",
-  "announcement.announcement": "Anoncoj",
+  "announcement.announcement": "Anonco",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
   "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.",
@@ -105,13 +105,13 @@
   "bundle_column_error.error.title": "Ho, ve!",
   "bundle_column_error.network.body": "Okazis eraro dum ŝarĝado de ĉi tiu paĝo. Tion povas kaŭzi portempa problemo pri via retkonektado aŭ pri ĉi tiu servilo.",
   "bundle_column_error.network.title": "Eraro de reto",
-  "bundle_column_error.retry": "Provu refoje",
+  "bundle_column_error.retry": "Provu denove",
   "bundle_column_error.return": "Reiri hejmen",
   "bundle_column_error.routing.body": "La celita paĝo ne troveblas. Ĉu vi certas, ke la retadreso (URL) en via retfoliumilo estas ĝusta?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Fermi",
   "bundle_modal_error.message": "Io misfunkciis en la ŝargado de ĉi tiu elemento.",
-  "bundle_modal_error.retry": "Bonvolu reprovi",
+  "bundle_modal_error.retry": "Provu denove",
   "closed_registrations.other_server_instructions": "Ĉar Mastodon estas malcentraliza, vi povas krei konton ĉe alia servilo kaj ankoraŭ komuniki kun ĉi tiu.",
   "closed_registrations_modal.description": "Krei konton ĉe {domain} aktuale ne eblas, tamen bonvole rimarku, ke vi ne bezonas konton specife ĉe {domain} por uzi Mastodon.",
   "closed_registrations_modal.find_another_server": "Trovi alian servilon",
@@ -163,7 +163,7 @@
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
   "compose_form.poll.type": "Stilo",
   "compose_form.publish": "Afiŝo",
-  "compose_form.publish_form": "Afiŝi",
+  "compose_form.publish_form": "Nova afiŝo",
   "compose_form.reply": "Respondi",
   "compose_form.save_changes": "Ĝisdatigi",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
@@ -173,7 +173,7 @@
   "confirmations.block.confirm": "Bloki",
   "confirmations.delete.confirm": "Forigi",
   "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun afiŝon?",
-  "confirmations.delete.title": "Ĉu forigi Afiŝon?",
+  "confirmations.delete.title": "Ĉu forigi afiŝon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.delete_list.title": "Ĉu forigi liston?",
@@ -182,8 +182,8 @@
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.edit.title": "Ĉu superskribi afiŝon?",
-  "confirmations.logout.confirm": "Adiaŭi",
+  "confirmations.logout.confirm": "Elsaluti",
-  "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
+  "confirmations.logout.message": "Ĉu vi certas, ke vi volas elsaluti?",
   "confirmations.logout.title": "Ĉu elsaluti?",
   "confirmations.mute.confirm": "Silentigi",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
@@ -198,7 +198,7 @@
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
   "conversation.delete": "Forigi konversacion",
-  "conversation.mark_as_read": "Marki legita",
+  "conversation.mark_as_read": "Marku kiel legita",
   "conversation.open": "Vidi konversacion",
   "conversation.with": "Kun {names}",
   "copy_icon_button.copied": "Kopiis al kliptabulo",
@@ -213,9 +213,9 @@
   "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
   "dismissable_banner.dismiss": "Eksigi",
   "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.",
-  "dismissable_banner.explore_statuses": "Ĉi tioj estas afiŝoj de socia reto kiu populariĝas hodiau.",
+  "dismissable_banner.explore_statuses": "Ĉi tiuj estas afiŝoj de la tuta socia reto, kiuj populariĝas hodiaŭ. Pli novaj afiŝoj kun pli da diskonigoj kaj plej ŝatataj estas rangigitaj pli alte.",
   "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
-  "dismissable_banner.public_timeline": "Ĉi tioj estas plej lastaj publikaj afiŝoj de personoj ĉe socia reto kiu personoj ĉe {domain} sekvas.",
+  "dismissable_banner.public_timeline": "Ĉi tiuj estas la plej lastatempaj publikaj afiŝoj de homoj en la socia reto, kiujn homoj sur {domain} sekvas.",
   "domain_block_modal.block": "Bloki servilon",
   "domain_block_modal.block_account_instead": "Bloki @{name} anstataŭe",
   "domain_block_modal.they_can_interact_with_old_posts": "Homoj de ĉi tiu servilo povas interagi kun viaj malnovaj afiŝoj.",
@@ -247,26 +247,26 @@
   "emoji_button.food": "Manĝi kaj trinki",
   "emoji_button.label": "Enmeti emoĝion",
   "emoji_button.nature": "Naturo",
-  "emoji_button.not_found": "Neniu emoĝio!! (╯°□°）╯︵ ┻━┻",
+  "emoji_button.not_found": "Neniuj kongruaj emoĝioj trovitaj",
   "emoji_button.objects": "Aĵoj",
   "emoji_button.people": "Homoj",
   "emoji_button.recent": "Ofte uzataj",
-  "emoji_button.search": "Serĉo…",
+  "emoji_button.search": "Serĉo...",
   "emoji_button.search_results": "Serĉaj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "Vojaĝoj kaj lokoj",
   "empty_column.account_hides_collections": "Ĉi tiu uzanto elektis ne disponebligi ĉi tiu informon",
   "empty_column.account_suspended": "Konto suspendita",
-  "empty_column.account_timeline": "Neniu afiŝo ĉi tie!",
+  "empty_column.account_timeline": "Neniuj afiŝoj ĉi tie!",
-  "empty_column.account_unavailable": "Profilo ne disponebla",
+  "empty_column.account_unavailable": "Profilo nedisponebla",
   "empty_column.blocks": "Vi ankoraŭ ne blokis uzanton.",
   "empty_column.bookmarked_statuses": "Vi ankoraŭ ne aldonis afiŝon al viaj legosignoj. Kiam vi aldonos iun, tiu aperos ĉi tie.",
   "empty_column.community": "La loka templinio estas malplena. Skribu ion por plenigi ĝin!",
   "empty_column.direct": "Vi ankoraŭ ne havas privatan mencion. Kiam vi sendos aŭ ricevos iun, tiu aperos ĉi tie.",
   "empty_column.domain_blocks": "Ankoraŭ neniu domajno estas blokita.",
   "empty_column.explore_statuses": "Nenio tendencas nun. Rekontrolu poste!",
-  "empty_column.favourited_statuses": "Vi ankoraŭ ne havas stelumitan afiŝon.",
+  "empty_column.favourited_statuses": "Vi ankoraŭ ne havas plej ŝatatajn afiŝojn. Kiam vi ŝatatas unu, ĝi aperos ĉi tie.",
-  "empty_column.favourites": "Ankoraŭ neniu stelumis tiun afiŝon.",
+  "empty_column.favourites": "Neniu ankoraŭ ŝatis ĉi tiun afiŝon. Kiam iu ŝatos ĝin, ili aperos ĉi tie.",
   "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝi aperos ĉi tie.",
   "empty_column.followed_tags": "Vi ankoraŭ ne sekvas iujn kradvortojn. Kiam vi faras, ili aperos ĉi tie.",
   "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.",
@@ -296,7 +296,7 @@
   "filter_modal.added.review_and_configure": "Por kontroli kaj pli modifi ĉi tiu filtrilkategorio, iru al la {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Filtrilopcioj",
   "filter_modal.added.settings_link": "opciopaĝo",
-  "filter_modal.added.short_explanation": "Ĉi tiu mesaĝo aldonitas al la filtrilkategorio: {title}.",
+  "filter_modal.added.short_explanation": "Ĉi tiu afiŝo aldonitas al la filtrilkategorio: {title}.",
   "filter_modal.added.title": "Filtrilo aldonita!",
   "filter_modal.select_filter.context_mismatch": "ne kongruas la kuntekston",
   "filter_modal.select_filter.expired": "eksvalidiĝinta",
@@ -304,7 +304,7 @@
   "filter_modal.select_filter.search": "Serĉi aŭ krei",
   "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
   "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
-  "filter_modal.title.status": "Filtri mesaĝon",
+  "filter_modal.title.status": "Filtri afiŝon",
   "filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
   "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
   "filtered_notifications_banner.title": "Filtritaj sciigoj",
@@ -343,7 +343,7 @@
   "hashtag.column_header.tag_mode.all": "kaj {additional}",
   "hashtag.column_header.tag_mode.any": "aŭ {additional}",
   "hashtag.column_header.tag_mode.none": "sen {additional}",
-  "hashtag.column_settings.select.no_options_message": "Neniu sugesto trovita",
+  "hashtag.column_settings.select.no_options_message": "Neniuj sugestoj trovitaj",
   "hashtag.column_settings.select.placeholder": "Enmeti kradvortojn…",
   "hashtag.column_settings.tag_mode.all": "Ĉiuj",
   "hashtag.column_settings.tag_mode.any": "Iu ajn",
@@ -351,7 +351,7 @@
   "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno",
   "hashtag.counter_by_accounts": "{count, plural,one {{counter} partoprenanto} other {{counter} partoprenantoj}}",
   "hashtag.counter_by_uses": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}}",
-  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiau",
+  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiaŭ",
   "hashtag.follow": "Sekvi la kradvorton",
   "hashtag.unfollow": "Ne plu sekvi la kradvorton",
   "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
@@ -382,9 +382,9 @@
   "ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
   "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
   "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumiti ĉi tiun afiŝon por sciigi la afiŝanton ke vi aprezigas ŝin kaj konservas por la estonteco.",
-  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.",
+  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
   "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
-  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
+  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
   "interaction_modal.login.action": "Prenu min hejmen",
   "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
   "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
@@ -399,40 +399,40 @@
   "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutoj}}",
-  "keyboard_shortcuts.back": "reveni",
+  "keyboard_shortcuts.back": "Reiru reen",
   "keyboard_shortcuts.blocked": "Malfermi la liston de blokitaj uzantoj",
   "keyboard_shortcuts.boost": "Diskonigi la mesaĝon",
-  "keyboard_shortcuts.column": "fokusi mesaĝon en unu el la kolumnoj",
+  "keyboard_shortcuts.column": "Fokusi kolumnon",
-  "keyboard_shortcuts.compose": "enfokusigi la tekstujon",
+  "keyboard_shortcuts.compose": "Enfokusigi la tekstaron",
   "keyboard_shortcuts.description": "Priskribo",
   "keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj",
-  "keyboard_shortcuts.down": "iri suben en la listo",
+  "keyboard_shortcuts.down": "Movu malsupren en la listo",
-  "keyboard_shortcuts.enter": "malfermi mesaĝon",
+  "keyboard_shortcuts.enter": "Malfermi afiŝon",
   "keyboard_shortcuts.favourite": "Stelumi afiŝon",
   "keyboard_shortcuts.favourites": "Malfermi la liston de la stelumoj",
   "keyboard_shortcuts.federated": "Malfermi la frataran templinion",
-  "keyboard_shortcuts.heading": "Klavaraj mallongigoj",
+  "keyboard_shortcuts.heading": "Fulmoklavoj",
   "keyboard_shortcuts.home": "Malfermi la hejman templinion",
   "keyboard_shortcuts.hotkey": "Rapidklavo",
-  "keyboard_shortcuts.legend": "montri ĉi tiun noton",
+  "keyboard_shortcuts.legend": "Montru ĉi tiun legendon",
-  "keyboard_shortcuts.local": "Malfermi la lokan templinion",
+  "keyboard_shortcuts.local": "Malfermu la lokan templinion",
-  "keyboard_shortcuts.mention": "mencii la aŭtoron",
+  "keyboard_shortcuts.mention": "Menciu aŭtoron",
-  "keyboard_shortcuts.muted": "malfermi la liston de silentigitaj uzantoj",
+  "keyboard_shortcuts.muted": "Malfermu la liston de silentigitaj uzantoj",
-  "keyboard_shortcuts.my_profile": "malfermi vian profilon",
+  "keyboard_shortcuts.my_profile": "Malfermu vian profilon",
-  "keyboard_shortcuts.notifications": "malfermi la kolumnon de sciigoj",
+  "keyboard_shortcuts.notifications": "Malfermu la sciigajn kolumnon",
-  "keyboard_shortcuts.open_media": "Malfermi plurmedion",
+  "keyboard_shortcuts.open_media": "Malfermu plurmedion",
-  "keyboard_shortcuts.pinned": "malfermi la liston de alpinglitaj mesaĝoj",
+  "keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
-  "keyboard_shortcuts.profile": "malfermi la profilon de la aŭtoro",
+  "keyboard_shortcuts.profile": "Malfermu la profilon de aŭtoro",
-  "keyboard_shortcuts.reply": "respondi",
+  "keyboard_shortcuts.reply": "Respondu al afiŝo",
   "keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
-  "keyboard_shortcuts.search": "enfokusigi la serĉilon",
+  "keyboard_shortcuts.search": "Enfokusigi la serĉbreton",
-  "keyboard_shortcuts.spoilers": "Montri/kaŝi la kampon de averto de enhavo (\"CW\")",
+  "keyboard_shortcuts.spoilers": "Montri/kaŝi CW-kampon",
-  "keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»",
+  "keyboard_shortcuts.start": "Malfermu \"por komenci\" kolumnon",
-  "keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ la averto de enhavo (\"CW\")",
+  "keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ CW",
   "keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi plurmedion",
-  "keyboard_shortcuts.toot": "Krei novan mesaĝon",
+  "keyboard_shortcuts.toot": "Komencu novan afiŝon",
-  "keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aŭ la serĉilon",
+  "keyboard_shortcuts.unfocus": "Senfokusigi verki tekstareon/serĉon",
-  "keyboard_shortcuts.up": "iri supren en la listo",
+  "keyboard_shortcuts.up": "Movu supren en la listo",
   "lightbox.close": "Fermi",
   "lightbox.next": "Antaŭen",
   "lightbox.previous": "Malantaŭen",
@@ -476,9 +476,9 @@
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.bookmarks": "Legosignoj",
   "navigation_bar.community_timeline": "Loka templinio",
-  "navigation_bar.compose": "Skribi novan mesaĝon",
+  "navigation_bar.compose": "Redakti novan afiŝon",
   "navigation_bar.direct": "Privataj mencioj",
-  "navigation_bar.discover": "Esplori",
+  "navigation_bar.discover": "Malkovri",
   "navigation_bar.domain_blocks": "Blokitaj domajnoj",
   "navigation_bar.explore": "Esplori",
   "navigation_bar.favourites": "Stelumoj",
@@ -487,12 +487,12 @@
   "navigation_bar.followed_tags": "Sekvataj kradvortoj",
   "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
   "navigation_bar.lists": "Listoj",
-  "navigation_bar.logout": "Adiaŭi",
+  "navigation_bar.logout": "Elsaluti",
   "navigation_bar.moderation": "Modereco",
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
   "navigation_bar.personal": "Persone",
-  "navigation_bar.pins": "Alpinglitaj mesaĝoj",
+  "navigation_bar.pins": "Alpinglitaj afiŝoj",
   "navigation_bar.preferences": "Preferoj",
   "navigation_bar.public_timeline": "Fratara templinio",
   "navigation_bar.search": "Serĉi",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} stelumis vian afiŝon",
   "notification.favourite.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> ŝatis vian afiŝon",
   "notification.follow": "{name} eksekvis vin",
-  "notification.follow.name_and_others": "{name} kaj {count, plural, one {# alia} other {# aliaj}} sekvis vin",
+  "notification.follow.name_and_others": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> sekvis vin",
   "notification.follow_request": "{name} petis sekvi vin",
   "notification.follow_request.name_and_others": "{name} kaj {count, plural, one {# alia} other {# aliaj}} petis sekvi vin",
   "notification.label.mention": "Mencii",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Privata respondo",
   "notification.label.reply": "Respondi",
   "notification.mention": "Mencii",
+  "notification.mentioned_you": "{name} menciis vin",
   "notification.moderation-warning.learn_more": "Lerni pli",
   "notification.moderation_warning": "Vi ricevis moderigan averton",
   "notification.moderation_warning.action_delete_statuses": "Kelkaj el viaj afiŝoj estis forigitaj.",
@@ -566,13 +567,14 @@
   "notifications.column_settings.filter_bar.category": "Rapida filtrila breto",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Mencioj:",
   "notifications.column_settings.poll": "Balotenketaj rezultoj:",
   "notifications.column_settings.push": "Puŝsciigoj",
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
-  "notifications.column_settings.status": "Novaj mesaĝoj:",
+  "notifications.column_settings.status": "Novaj afiŝoj:",
   "notifications.column_settings.unread_notifications.category": "Nelegitaj sciigoj",
   "notifications.column_settings.unread_notifications.highlight": "Marki nelegitajn sciigojn",
   "notifications.column_settings.update": "Redaktoj:",
@@ -611,8 +613,8 @@
   "notifications_permission_banner.title": "Neniam preterlasas iun ajn",
   "onboarding.action.back": "Prenu min reen",
   "onboarding.actions.back": "Prenu min reen",
-  "onboarding.actions.go_to_explore": "See what's trending",
+  "onboarding.actions.go_to_explore": "Konduku min al tendenco",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_home": "Konduku min al mia hejma fluo",
   "onboarding.compose.template": "Saluton #Mastodon!",
   "onboarding.follows.empty": "Bedaŭrinde, neniu rezulto estas montrebla nuntempe. Vi povas provi serĉi aŭ foliumi la esploran paĝon por trovi kontojn por sekvi, aŭ retrovi baldaŭ.",
   "onboarding.follows.lead": "Via hejma fluo estas la ĉefa maniero sperti Mastodon. Ju pli da homoj vi sekvas, des pli aktiva kaj interesa ĝi estos. Por komenci, jen kelkaj sugestoj:",
@@ -632,17 +634,17 @@
   "onboarding.share.message": "Mi estas {username} en #Mastodon! Sekvu min ĉe {url}",
   "onboarding.share.next_steps": "Eblaj malantauaj paŝoj:",
   "onboarding.share.title": "Disvastigi vian profilon",
-  "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
+  "onboarding.start.lead": "Vi nun estas parto de Mastodon, unika, malcentralizita socia amaskomunikilara platformo, kie vi—ne algoritmo—zorgas vian propran sperton. Ni komencu vin sur ĉi tiu nova socia limo:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.skip": "Ĉu vi ne bezonas helpon por komenci?",
   "onboarding.start.title": "Vi atingas ĝin!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "Sekvi interesajn homojn estas pri kio Mastodonto temas.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
+  "onboarding.steps.follow_people.title": "Agordu vian hejman fluon",
   "onboarding.steps.publish_status.body": "Salutu la mondon per teksto, fotoj, filmetoj aŭ balotenketoj {emoji}",
   "onboarding.steps.publish_status.title": "Fari vian unuan afiŝon",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
+  "onboarding.steps.setup_profile.body": "Diskonigu viajn interagojn havante ampleksan profilon.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
+  "onboarding.steps.setup_profile.title": "Agordu vian profilon",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+  "onboarding.steps.share_profile.body": "Sciigu viajn amikojn kiel trovi vin sur Mastodon",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.share_profile.title": "Kunhavigu vian Mastodon-profilon",
   "onboarding.tips.2fa": "<strong>Ĉu vi scias?</strong> Vi povas sekurigi vian konton per efektivigi dufaktora autentigo en via kontoagordoj.",
   "onboarding.tips.accounts_from_other_servers": "<strong>Ĉu vi scias?</strong> Ĉar Mastodon estas sencentra, kelkaj profiloj kiujn vi trovi estas gastigitaj ĉe aliaj serviloj kiuj ne estas via.",
   "onboarding.tips.migration": "<strong>Ĉu vi scias?</strong> Se vi sentas ke {domain} ne estas bona servilelekto por vi en la estonteco, vi povas translokiĝi al alia servilo de Mastodon sen malgajni viajn sekvantojn.",
@@ -660,7 +662,7 @@
   "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
-  "privacy.change": "Agordi mesaĝan privatecon",
+  "privacy.change": "Ŝanĝu afiŝan privatecon",
   "privacy.direct.long": "Ĉiuj menciitaj en la afiŝo",
   "privacy.direct.short": "Specifaj homoj",
   "privacy.private.long": "Nur viaj sekvantoj",
@@ -775,13 +777,13 @@
   "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
   "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
   "status.admin_domain": "Malfermu moderigan interfacon por {domain}",
-  "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
+  "status.admin_status": "Malfermi ĉi tiun afiŝon en la kontrola interfaco",
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",
   "status.cancel_reblog_private": "Ne plu diskonigi",
   "status.cannot_reblog": "Ĉi tiun afiŝon ne eblas diskonigi",
   "status.continued_thread": "Daŭrigis fadenon",
-  "status.copy": "Kopii la ligilon al la mesaĝo",
+  "status.copy": "Kopii la ligilon al la afiŝo",
   "status.delete": "Forigi",
   "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Private mencii @{name}",
@@ -803,9 +805,9 @@
   "status.more": "Pli",
   "status.mute": "Silentigi @{name}",
   "status.mute_conversation": "Silentigi konversacion",
-  "status.open": "Disvolvi la mesaĝon",
+  "status.open": "Pligrandigu ĉi tiun afiŝon",
   "status.pin": "Alpingli al la profilo",
-  "status.pinned": "Alpinglita mesaĝo",
+  "status.pinned": "Alpinglita afiŝo",
   "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
   "status.reblog_private": "Diskonigi kun la sama videbleco",
@@ -824,7 +826,7 @@
   "status.show_less_all": "Montri malpli ĉiun",
   "status.show_more_all": "Montri pli ĉiun",
   "status.show_original": "Montru originalon",
-  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
+  "status.title.with_attachments": "{user} afiŝis {attachmentCount, plural, one {aldonaĵon} other {{attachmentCount} aldonaĵojn}}",
   "status.translate": "Traduki",
   "status.translated_from_with": "Tradukita el {lang} per {provider}",
   "status.uncached_media_warning": "Antaŭrigardo ne disponebla",
@@ -847,7 +849,7 @@
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
   "upload_area.title": "Altreni kaj lasi por alŝuti",
-  "upload_button.label": "Aldoni aŭdovidaĵon (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Aldonu bildojn, filmeton aŭ sondosieron",
   "upload_error.limit": "Limo de dosiera alŝutado transpasita.",
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
   "upload_form.audio_description": "Priskribi por homoj kiuj malfacile aŭdi",
@@ -870,17 +872,17 @@
   "upload_modal.hint": "Klaku aŭ trenu la cirklon en la antaŭvidilo por elekti la fokuspunkton kiu ĉiam videblos en ĉiuj etigitaj bildoj.",
   "upload_modal.preparing_ocr": "Preparante OSR…",
   "upload_modal.preview_label": "Antaŭvido ({ratio})",
-  "upload_progress.label": "Alŝutado…",
+  "upload_progress.label": "Alŝutante...",
   "upload_progress.processing": "Traktante…",
   "username.taken": "La uzantnomo estas jam posedita. Provu alion",
-  "video.close": "Fermi la videon",
+  "video.close": "Fermu la filmeton",
   "video.download": "Elŝuti dosieron",
   "video.exit_fullscreen": "Eksigi plenekrana",
   "video.expand": "Pligrandigi la videon",
   "video.fullscreen": "Igi plenekrana",
-  "video.hide": "Kaŝi la videon",
+  "video.hide": "Kaŝu la filmeton",
   "video.mute": "Silentigi",
-  "video.pause": "Paŭzi",
+  "video.pause": "Paŭzigi",
   "video.play": "Ekigi",
   "video.unmute": "Malsilentigi"
 }

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

@@ -249,7 +249,7 @@
   "emoji_button.nature": "Naturaleza",
   "emoji_button.not_found": "No se encontraron emojis coincidentes",
   "emoji_button.objects": "Objetos",
-  "emoji_button.people": "Cuentas",
+  "emoji_button.people": "Gente",
   "emoji_button.recent": "Usados frecuentemente",
   "emoji_button.search": "Buscar...",
   "emoji_button.search_results": "Resultados de búsqueda",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} marcó tu mensaje como favorito",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
-  "notification.follow.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} te están siguiendo",
+  "notification.follow.name_and_others": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> te están siguiendo",
   "notification.follow_request": "{name} solicitó seguirte",
   "notification.follow_request.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} solicitaron seguirte",
   "notification.label.mention": "Mención",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Respuesta privada",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te mencionó",
   "notification.moderation-warning.learn_more": "Aprendé más",
   "notification.moderation_warning": "Recibiste una advertencia de moderación",
   "notification.moderation_warning.action_delete_statuses": "Se eliminaron algunos de tus mensajes.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
+  "notifications.column_settings.group": "Agrupar",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la encuesta:",
   "notifications.column_settings.push": "Notificaciones push",

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

@@ -159,8 +159,8 @@
   "compose_form.poll.multiple": "Selección múltiple",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.single": "Seleccione uno",
-  "compose_form.poll.switch_to_multiple": "Modificar encuesta para permitir múltiples opciones",
+  "compose_form.poll.switch_to_multiple": "Cambiar la encuesta para permitir múltiples opciones",
-  "compose_form.poll.switch_to_single": "Modificar encuesta para permitir una única opción",
+  "compose_form.poll.switch_to_single": "Cambiar la encuesta para permitir una única opción",
   "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicación",
   "compose_form.publish_form": "Publicar",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
-  "notification.follow.name_and_others": "{name} y {count, plural, one {# otro} other {# otros}} te siguieron",
+  "notification.follow.name_and_others": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> te han seguido",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.follow_request.name_and_others": "{name} y {count, plural, one {# otro} other {# otros}} han solicitado seguirte",
   "notification.label.mention": "Mención",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Respuesta privada",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te mencionó",
   "notification.moderation-warning.learn_more": "Saber más",
   "notification.moderation_warning": "Has recibido una advertencia de moderación",
   "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",
@@ -643,7 +645,7 @@
   "onboarding.steps.setup_profile.title": "Personaliza tu perfil",
   "onboarding.steps.share_profile.body": "Dile a tus amigos cómo encontrarte en Mastodon",
   "onboarding.steps.share_profile.title": "Comparte tu perfil",
-  "onboarding.tips.2fa": "<strong>¿Sabías que?</strong> Puedes proteger tu cuenta configurando la autenticación de dos factores en la configuración de su cuenta. Funciona con cualquier aplicación TOTP de su elección, ¡no necesitas número de teléfono!",
+  "onboarding.tips.2fa": "<strong>¿Sabías que?</strong> Puedes proteger tu cuenta configurando la autenticación de dos factores en los ajustes de su cuenta. Funciona con cualquier aplicación TOTP que elijas, ¡sin necesidad de número de teléfono!",
   "onboarding.tips.accounts_from_other_servers": "<strong>¿Sabías que?</strong> Como Mastodon es descentralizado, algunos perfiles que encuentras están alojados en servidores distintos del tuyo. Y sin embargo, ¡puedes interactuar con ellos! ¡Su servidor corresponde a la segunda mitad de su nombre de usuario!",
   "onboarding.tips.migration": "<strong>¿Sabías que?</strong> Si sientes que {domain} no es una gran elección de servidor para ti en el futuro, puedes moverte a otro servidor de Mastodon sin perder a tus seguidores. ¡Incluso puedes alojar tu propio servidor!",
   "onboarding.tips.verification": "<strong>¿Sabías que?</strong> Puedes verificar tu cuenta poniendo un enlace a tu perfil de Mastodon en su propio sitio web y añadiendo el sitio web a su perfil. ¡Sin necesidad de comisiones ni documentos!",
@@ -852,11 +854,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.instructions": "Para recoger un archivo adjunto, pulsa la barra espaciadora o la tecla Intro. Mientras arrastras, usa las teclas de flecha para mover el archivo adjunto en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Intro para soltar el archivo adjunto en su nueva posición, o pulsa 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_cancel": "Arrastre cancelado. El archivo adjunto {item} fue eliminado.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue eliminado.",
-  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} se ha movido.",
+  "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.drag_and_drop.on_drag_start": "Recogidos los archivos adjuntos {item}.",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Cambiar miniatura",
   "upload_form.video_description": "Describir para personas con problemas auditivos o visuales",

app/javascript/mastodon/locales/es.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} marcó como favorita tu publicación",
   "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
-  "notification.follow.name_and_others": "{name} y {count, plural, one {# más} other {# más}} te siguieron",
+  "notification.follow.name_and_others": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> te siguieron",
   "notification.follow_request": "{name} ha solicitado seguirte",
   "notification.follow_request.name_and_others": "{name} y {count, plural, one {# más} other {# más}} han solicitado seguirte",
   "notification.label.mention": "Mención",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Respuesta privada",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te ha mencionado",
   "notification.moderation-warning.learn_more": "Saber más",
   "notification.moderation_warning": "Has recibido una advertencia de moderación",
   "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",

app/javascript/mastodon/locales/et.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Kiiruspiirang",
   "alert.unexpected.message": "Tekkis ootamatu viga.",
   "alert.unexpected.title": "Oih!",
+  "alt_text_badge.title": "Alternatiivtekst",
   "announcement.announcement": "Teadaanne",
   "attachments_list.unprocessed": "(töötlemata)",
   "audio.hide": "Peida audio",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
   "domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
   "domain_block_modal.title": "Blokeerida domeen?",
+  "domain_block_modal.you_will_lose_num_followers": "Sult kaob {followersCount, plural, one {{followersCountDisplay} jälgija} other {{followersCountDisplay} jälgijat}} ja {followingCount, plural, one {{followingCountDisplay} inimene} other {{followingCountDisplay} inimest}}, keda sa ise jälgid.",
+  "domain_block_modal.you_will_lose_relationships": "Sa kaotad kõik oma jälgijad ja inimesed, kes sind jälgivad sellest serverist.",
   "domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
   "domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
   "domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
@@ -433,6 +436,8 @@
   "lightbox.close": "Sulge",
   "lightbox.next": "Järgmine",
   "lightbox.previous": "Eelmine",
+  "lightbox.zoom_in": "Näita algsuuruses",
+  "lightbox.zoom_out": "Näita kõik",
   "limited_account_hint.action": "Näita profilli sellegipoolest",
   "limited_account_hint.title": "See profiil on peidetud {domain} moderaatorite poolt.",
   "link_preview.author": "{name} poolt",
@@ -503,7 +508,6 @@
   "notification.favourite": "{name} märkis su postituse lemmikuks",
   "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
-  "notification.follow.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} hakkas sind jälgima",
   "notification.follow_request": "{name} soovib sind jälgida",
   "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} taotles sinu jälgimist",
   "notification.label.mention": "Mainimine",
@@ -511,6 +515,7 @@
   "notification.label.private_reply": "Privaatne vastus",
   "notification.label.reply": "Vastus",
   "notification.mention": "Mainimine",
+  "notification.mentioned_you": "{name} mainis sind",
   "notification.moderation-warning.learn_more": "Vaata lisa",
   "notification.moderation_warning": "Said modereerimise hoiatuse",
   "notification.moderation_warning.action_delete_statuses": "Mõni su postitus on eemaldatud.",
@@ -847,6 +852,11 @@
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
   "upload_form.audio_description": "Kirjelda kuulmispuudega inimeste jaoks",
   "upload_form.description": "Kirjelda vaegnägijatele",
+  "upload_form.drag_and_drop.instructions": "Vajuta tühikut või enterit, et tõsta manus. Lohistamise ajal kasuta nooleklahve, et manust liigutada teatud suunas. Vajuta tühikut või enterit uuesti, et paigutada manus oma uuele kohale, või escape tühistamiseks.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Lohistamine tühistati. Manus {item} on asetatud.",
+  "upload_form.drag_and_drop.on_drag_end": "Manus {item} on asetatud.",
+  "upload_form.drag_and_drop.on_drag_over": "Manus {item} on liigutatud.",
+  "upload_form.drag_and_drop.on_drag_start": "Tõstetud on manus {item}.",
   "upload_form.edit": "Muuda",
   "upload_form.thumbnail": "Muuda pisipilti",
   "upload_form.video_description": "Kirjelda kuulmis- või nägemispuudega inimeste jaoks",

app/javascript/mastodon/locales/eu.json

@@ -268,7 +268,7 @@
   "empty_column.follow_requests": "Ez duzu jarraitzeko eskaerarik oraindik. Baten bat jasotzen duzunean, hemen agertuko da.",
   "empty_column.followed_tags": "Oraindik ez duzu traolik jarraitzen. Egiterakoan, hemen agertuko dira.",
   "empty_column.hashtag": "Ez dago ezer traola honetan oraindik.",
-  "empty_column.home": "Zure hasierako denbora-lerroa hutsik dago! Ikusi {public} edo erabili bilaketa lehen urratsak eman eta beste batzuk aurkitzeko.",
+  "empty_column.home": "Zure hasierako denbora-lerroa hutsik dago! Jarraitu jende gehiago betetzeko.",
   "empty_column.list": "Ez dago ezer zerrenda honetan. Zerrenda honetako kideek bidalketa berriak argitaratzean, hemen agertuko dira.",
   "empty_column.lists": "Ez duzu zerrendarik oraindik. Baten bat sortzen duzunean hemen agertuko da.",
   "empty_column.mutes": "Ez duzu erabiltzailerik mututu oraindik.",
@@ -504,7 +504,6 @@
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
   "notification.favourite.name_and_others_with_link": "{name} eta <a>{count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}}</a> zure bidalketa gogoko dute",
   "notification.follow": "{name}(e)k jarraitzen dizu",
-  "notification.follow.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}} jarraitu dizute",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
   "notification.follow_request.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}} zu jarraitzeko eskaera egin dute",
   "notification.label.mention": "Aipamena",
@@ -597,7 +596,7 @@
   "notifications.policy.filter_not_following_title": "Jarraitzen ez duzun jendea",
   "notifications.policy.filter_private_mentions_hint": "Iragazita, baldin eta zure aipamenaren erantzuna bada edo bidaltzailea jarraitzen baduzu",
   "notifications.policy.filter_private_mentions_title": "Eskatu gabeko aipamen pribatuak",
-  "notifications.policy.title": "Kudeatu honen jakinarazpaenak…",
+  "notifications.policy.title": "Kudeatu honen jakinarazpenak…",
   "notifications_permission_banner.enable": "Gaitu mahaigaineko jakinarazpenak",
   "notifications_permission_banner.how_to_control": "Mastodon irekita ez dagoenean jakinarazpenak jasotzeko, gaitu mahaigaineko jakinarazpenak. Mahaigaineko jakinarazpenak ze elkarrekintzak eragingo dituzten zehazki kontrolatu dezakezu goiko {icon} botoia erabiliz, gaituta daudenean.",
   "notifications_permission_banner.title": "Ez galdu ezer inoiz",

app/javascript/mastodon/locales/fa.json

@@ -373,6 +373,7 @@
   "ignore_notifications_modal.new_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های جدید؟",
   "ignore_notifications_modal.not_followers_title": "چشم‌پوشی از آگاهی‌های افرادی که پیتان نمی‌گیرند؟",
   "ignore_notifications_modal.not_following_title": "چشم‌پوشی از آگاهی‌های افرادی که پیشان نمی‌گیرید؟",
+  "ignore_notifications_modal.private_mentions_title": "چشم‌پوشی از نام‌بری‌های خصوصی ناخواسته؟",
   "interaction_modal.description.favourite": "با حسابی روی ماستودون می‌توانید این فرسته را برگزیده تا نگارنده بداند قدردانش هستید و برای آینده ذخیره‌اش می‌کنید.",
   "interaction_modal.description.follow": "با حسابی روی ماستودون می‌توانید {name} را برای دریافت فرسته‌هایش در خوراک خانگیتان دنبال کنید.",
   "interaction_modal.description.reblog": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
@@ -494,7 +495,6 @@
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.follow": "‫{name}‬ پی‌گیرتان شد",
-  "notification.follow.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
   "notification.label.mention": "اشاره",
@@ -554,7 +554,7 @@
   "notifications.filter.all": "همه",
   "notifications.filter.boosts": "تقویت‌ها",
   "notifications.filter.favourites": "برگزیده‌ها",
-  "notifications.filter.follows": "پی‌گرفتگان",
+  "notifications.filter.follows": "پی‌گرفتن‌ها",
   "notifications.filter.mentions": "اشاره‌ها",
   "notifications.filter.polls": "نتایج نظرسنجی",
   "notifications.filter.statuses": "به‌روز رسانی‌ها از کسانی که پی‌گیرشانید",
@@ -572,10 +572,14 @@
   "notifications.policy.filter_hint": "فرستادن به صندوق آگاهی‌های پالوده",
   "notifications.policy.filter_limited_accounts_hint": "محدود شده به دست ناظم‌های کارساز",
   "notifications.policy.filter_limited_accounts_title": "حساب‌های مدیریت شده",
+  "notifications.policy.filter_new_accounts.hint": "ساخته شده در {days, plural, one {یک} other {#}} روز اخیر",
   "notifications.policy.filter_new_accounts_title": "حساب‌های جدید",
+  "notifications.policy.filter_not_followers_hint": "از جمله کسانی که کم‌تر از {days, plural, one {یک} other {#}} روز است پی‌تان می‌گیرند",
   "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند",
-  "notifications.policy.filter_not_following_hint": "",
+  "notifications.policy.filter_not_following_hint": "تا به صورت دستی تأییدشان کنید",
   "notifications.policy.filter_not_following_title": "کسانی که پی نمی‌گیرید",
+  "notifications.policy.filter_private_mentions_hint": "پالوده مگر این که به نام‌بری خودتان پاسخ داده یا پی‌گیر فرستنده باشید",
+  "notifications.policy.filter_private_mentions_title": "نام‌بری‌های خصوصی ناخواسته",
   "notifications.policy.title": "مدیریت آگاهی‌ها از…",
   "notifications_permission_banner.enable": "به کار انداختن آگاهی‌های میزکار",
   "notifications_permission_banner.how_to_control": "برای دریافت آگاهی‌ها هنگام باز نبودن ماستودون، آگاهی‌های میزکار را به کار بیندازید. پس از به کار افتادنشان می‌توانید گونه‌های دقیق برهم‌کنش‌هایی که آگاهی‌های میزکار تولید می‌کنند را از {icon} بالا واپایید.",

app/javascript/mastodon/locales/fi.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
   "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> lisäsivät julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} seurasivat sinua",
+  "notification.follow.name_and_others": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> seurasivat sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
   "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} pyysivät saada seurata sinua",
   "notification.label.mention": "Maininta",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Yksityinen vastaus",
   "notification.label.reply": "Vastaus",
   "notification.mention": "Maininta",
+  "notification.mentioned_you": "{name} mainitsi sinut",
   "notification.moderation-warning.learn_more": "Lue lisää",
   "notification.moderation_warning": "Olet saanut moderointivaroituksen",
   "notification.moderation_warning.action_delete_statuses": "Julkaisujasi on poistettu.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Pikasuodatuspalkki",
   "notifications.column_settings.follow": "Uudet seuraajat:",
   "notifications.column_settings.follow_request": "Uudet seurantapyynnöt:",
+  "notifications.column_settings.group": "Ryhmitä",
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.poll": "Äänestyksen tulokset:",
   "notifications.column_settings.push": "Puskuilmoitukset",

app/javascript/mastodon/locales/fil.json

@@ -46,9 +46,11 @@
   "account.media": "Medya",
   "account.mention": "Banggitin si @{name}",
   "account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+  "account.no_bio": "Walang nakalaan na paglalarawan.",
   "account.open_original_page": "Buksan ang pinagmulang pahina",
   "account.report": "I-ulat si/ang @{name}",
   "account.requested_follow": "Hinihiling ni {name} na sundan ka",
+  "account.share": "Ibahagi ang profile ni @{name}",
   "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
   "account.unendorse": "Huwag itampok sa profile",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
@@ -56,7 +58,11 @@
   "audio.hide": "Itago ang tunog",
   "block_modal.show_less": "Magpakita ng mas kaunti",
   "block_modal.show_more": "Magpakita ng higit pa",
+  "block_modal.they_cant_mention": "Hindi sila makakabanggit sa iyo o sundan ka.",
+  "block_modal.they_will_know": "Makita nila na hinarangan sila.",
   "block_modal.title": "Harangan ang tagagamit?",
+  "block_modal.you_wont_see_mentions": "Hindi ka makakakita ng mga post na nagbanggit sa kanila.",
+  "boost_modal.combo": "Maari mong pindutin ang {combo} upang laktawan ito sa susunod na oras",
   "bundle_column_error.error.title": "Naku!",
   "bundle_column_error.network.body": "Nagkaroon ng kamalian habang sinusubukang i-karga ang pahinang ito. Maaaring dahil ito sa pansamantalang problema ng iyong koneksyon sa internet o ang server na ito.",
   "bundle_column_error.network.title": "Kamaliang network",
@@ -107,6 +113,8 @@
   "compose_form.direct_message_warning_learn_more": "Matuto pa",
   "compose_form.encryption_warning": "Ang mga post sa Mastodon ay hindi naka-encrypt nang dulo-dulo. Huwag magbahagi ng anumang sensitibong impormasyon sa Mastodon.",
   "compose_form.hashtag_warning": "Hindi maililista ang post na ito sa anumang hashtag dahil hindi ito nakapubliko. Mga nakapublikong post lamang ang mahahanap ayon sa hashtag.",
+  "compose_form.lock_disclaimer": "Hindi {locked} ang iyong account. Maaaring susundan ka ng sinuman upang tingnan ang iyong mga post na para sa mga tagasunod lamang.",
+  "compose_form.lock_disclaimer.lock": "nakakandado",
   "compose_form.placeholder": "Anong nangyari?",
   "compose_form.poll.duration": "Tagal ng botohan",
   "compose_form.poll.multiple": "Maraming pagpipilian",
@@ -123,6 +131,7 @@
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
+  "conversation.open": "Tingnan ang pag-uusap",
   "copy_icon_button.copied": "Sinipi sa clipboard",
   "copypaste.copied": "Sinipi",
   "copypaste.copy_to_clipboard": "I-sipi sa clipboard",
@@ -176,6 +185,7 @@
   "empty_column.home": "Walang laman ang timeline ng tahanan mo! Sumunod sa marami pang tao para mapunan ito.",
   "empty_column.list": "Wala pang laman ang listahang ito. Kapag naglathala ng mga bagong post ang mga miyembro ng listahang ito, makikita iyon dito.",
   "empty_column.lists": "Wala ka pang mga listahan. Kapag gumawa ka ng isa, makikita yun dito.",
+  "errors.unexpected_crash.report_issue": "Iulat ang isyu",
   "explore.search_results": "Mga resulta ng paghahanap",
   "explore.suggested_follows": "Mga tao",
   "explore.title": "Tuklasin",
@@ -187,6 +197,7 @@
   "follow_request.authorize": "Tanggapin",
   "follow_request.reject": "Tanggihan",
   "follow_suggestions.dismiss": "Huwag nang ipakita muli",
+  "follow_suggestions.popular_suggestion": "Sikat na mungkahi",
   "follow_suggestions.popular_suggestion_longer": "Sikat sa {domain}",
   "follow_suggestions.view_all": "Tingnan lahat",
   "follow_suggestions.who_to_follow": "Sinong maaaring sundan",
@@ -196,6 +207,7 @@
   "generic.saved": "Nakaimbak",
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
+  "hashtag.column_settings.select.no_options_message": "Walang mungkahing nakita",
   "hashtag.column_settings.tag_mode.all": "Lahat ng nandito",
   "hashtag.column_settings.tag_mode.any": "Ilan dito",
   "hashtag.column_settings.tag_mode.none": "Wala dito",
@@ -223,11 +235,14 @@
   "lists.account.add": "Idagdag sa talaan",
   "lists.account.remove": "Tanggalin mula sa talaan",
   "lists.delete": "Burahin ang listahan",
+  "lists.edit.submit": "Baguhin ang pamagat",
   "lists.new.create": "Idagdag sa talaan",
   "lists.new.title_placeholder": "Bagong pangalan ng talaan",
+  "lists.replies_policy.none": "Walang simuman",
   "lists.replies_policy.title": "Ipakita ang mga tugon sa:",
   "lists.subheading": "Iyong mga talaan",
   "loading_indicator.label": "Kumakarga…",
+  "media_gallery.hide": "Itago",
   "mute_modal.hide_from_notifications": "Itago mula sa mga abiso",
   "navigation_bar.about": "Tungkol dito",
   "navigation_bar.blocks": "Nakaharang na mga tagagamit",
@@ -243,11 +258,15 @@
   "notification.admin.report": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
   "notification.follow_request": "Hinihiling ni {name} na sundan ka",
+  "notification.label.private_mention": "Palihim na banggit",
+  "notification.mentioned_you": "Binanggit ka ni {name}",
+  "notification.moderation-warning.learn_more": "Matuto nang higit pa",
   "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
   "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
   "notification_requests.accept": "Tanggapin",
   "notification_requests.notifications_from": "Mga abiso mula kay/sa {name}",
   "notifications.clear": "Burahin mga abiso",
+  "notifications.clear_title": "Linisin ang mga abiso?",
   "notifications.column_settings.admin.report": "Mga bagong ulat:",
   "notifications.column_settings.alert": "Mga abiso sa Desktop",
   "notifications.column_settings.favourite": "Mga paborito:",
@@ -259,6 +278,8 @@
   "notifications.filter.favourites": "Mga paborito",
   "notifications.filter.polls": "Resulta ng botohan",
   "notifications.mark_as_read": "Markahan lahat ng abiso bilang nabasa na",
+  "notifications.policy.accept": "Tanggapin",
+  "notifications.policy.accept_hint": "Ipakita sa mga abiso",
   "notifications.policy.filter_not_followers_title": "Mga taong hindi ka susundan",
   "notifications.policy.filter_not_following_title": "Mga taong hindi mo sinusundan",
   "onboarding.action.back": "Ibalik mo ako",
@@ -275,6 +296,10 @@
   "privacy.private.long": "Mga tagasunod mo lamang",
   "privacy.private.short": "Mga tagasunod",
   "privacy.public.long": "Sinumang nasa loob at labas ng Mastodon",
+  "privacy.public.short": "Pampubliko",
+  "privacy.unlisted.short": "Hindi nakalista",
+  "privacy_policy.last_updated": "Huling nabago noong {date}",
+  "recommended": "Inirekomenda",
   "regeneration_indicator.label": "Kumakarga…",
   "relative_time.days": "{number}a",
   "relative_time.full.days": "{number, plural, one {# araw} other {# na araw}} ang nakalipas",
@@ -286,6 +311,7 @@
   "relative_time.just_now": "ngayon",
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
+  "relative_time.today": "ngayon",
   "reply_indicator.cancel": "Ipagpaliban",
   "report.block": "Harangan",
   "report.categories.other": "Iba pa",
@@ -293,9 +319,11 @@
   "report.category.subtitle": "Piliin ang pinakamahusay na tugma",
   "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
   "report.close": "Tapos na",
+  "report.comment.title": "Mayroon pa bang dapat naming malaman?",
   "report.next": "Sunod",
   "report.placeholder": "Mga Karagdagang Puna",
   "report.reasons.dislike": "Hindi ko gusto ito",
+  "report.reasons.legal": "Labag ito sa batas",
   "report.reasons.violation": "Lumalabag ito sa mga panuntunan ng serbiro",
   "report.reasons.violation_description": "Alam mo na lumalabag ito sa mga partikular na panuntunan",
   "report.rules.title": "Aling mga patakaran ang nilabag?",
@@ -342,5 +370,8 @@
   "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
   "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
-  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira"
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
+  "upload_modal.apply": "Ilapat",
+  "upload_modal.applying": "Nilalapat…",
+  "upload_modal.choose_image": "Pumili ng larawan"
 }

app/javascript/mastodon/locales/fo.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} dámdi postin hjá tær",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> yndisfrámerktu postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
-  "notification.follow.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} fylgdu tær",
+  "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> fylgdu tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
   "notification.follow_request.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} hava biðið um at fylgja tær",
   "notification.label.mention": "Umrøða",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Privat svar",
   "notification.label.reply": "Svara",
   "notification.mention": "Umrøð",
+  "notification.mentioned_you": "{name} nevndi teg",
   "notification.moderation-warning.learn_more": "Lær meira",
   "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávaring",
   "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Skjótfilturbjálki",
   "notifications.column_settings.follow": "Nýggir fylgjarar:",
   "notifications.column_settings.follow_request": "Nýggjar umbønir um at fylgja:",
+  "notifications.column_settings.group": "Bólkur",
   "notifications.column_settings.mention": "Umrøður:",
   "notifications.column_settings.poll": "Úrslit frá atkvøðugreiðslu:",
   "notifications.column_settings.push": "Trýstifráboðanir",

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

@@ -89,7 +89,7 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.",
   "block_modal.show_less": "Afficher moins",
   "block_modal.show_more": "Afficher plus",
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
@@ -194,7 +194,7 @@
   "confirmations.reply.title": "Remplacer le message ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
+  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Afficher quand même",
   "conversation.delete": "Supprimer cette conversation",
@@ -224,7 +224,7 @@
   "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_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateur·rice·s 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.",
   "domain_pill.server": "Serveur",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
   "notification.favourite.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont mis votre message en favori",
   "notification.follow": "{name} vous suit",
-  "notification.follow.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont abonné à votre compte",
+  "notification.follow.name_and_others": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> vous suivent",
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Répondre en privé",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
+  "notification.mentioned_you": "{name} vous a mentionné·e",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -542,12 +543,12 @@
   "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
-  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d’{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne pourrez plus {count, plural, one {y} other {y}} accéder facilement plus tard. Voulez-vous vraiment continuer ?",
   "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
   "notification_requests.edit_selection": "Modifier",
-  "notification_requests.exit_selection": "Fait",
+  "notification_requests.exit_selection": "Terminé",
   "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
   "notification_requests.explainer_for_limited_remote_account": "Les notifications en provenance de ce compte ont été filtrées car le compte ou le serveur dont il est issu a été limité par un modérateur.",
   "notification_requests.maximize": "Agrandir",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux⋅elles abonné⋅e⋅s:",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement:",
+  "notifications.column_settings.group": "Grouper",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Résultats des sondages:",
   "notifications.column_settings.push": "Notifications push",
@@ -852,6 +854,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyants",
+  "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fr.json

@@ -79,7 +79,7 @@
   "admin.dashboard.retention.cohort_size": "Nouveaux comptes",
   "admin.impact_report.instance_accounts": "Profils de comptes que cela supprimerait",
   "admin.impact_report.instance_followers": "Abonnées que nos utilisateurs perdraient",
-  "admin.impact_report.instance_follows": "Abonnées que leurs utilisateurs perdraient",
+  "admin.impact_report.instance_follows": "Abonné·e·s que leurs utilisateur·rice·s perdraient",
   "admin.impact_report.title": "Résumé de l'impact",
   "alert.rate_limited.message": "Veuillez réessayer après {retry_time, time, medium}.",
   "alert.rate_limited.title": "Nombre de requêtes limité",
@@ -89,7 +89,7 @@
   "announcement.announcement": "Annonce",
   "attachments_list.unprocessed": "(non traité)",
   "audio.hide": "Masquer l'audio",
-  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateurs non connectés.",
+  "block_modal.remote_users_caveat": "Nous allons demander au serveur {domain} de respecter votre décision. Cependant, ce respect n'est pas garanti, car certains serveurs peuvent gérer différemment les blocages. Les messages publics peuvent rester visibles par les utilisateur·rice·s non connecté·e·s.",
   "block_modal.show_less": "Afficher moins",
   "block_modal.show_more": "Afficher plus",
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
@@ -194,7 +194,7 @@
   "confirmations.reply.title": "Remplacer le message ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
   "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur ?",
+  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Afficher quand même",
   "conversation.delete": "Supprimer la conversation",
@@ -224,7 +224,7 @@
   "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_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateur·rice·s 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.",
   "domain_pill.server": "Serveur",
@@ -262,7 +262,7 @@
   "empty_column.blocks": "Vous n’avez bloqué aucun compte pour le moment.",
   "empty_column.bookmarked_statuses": "Vous n'avez pas de message en marque-page. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.community": "Le fil public local est vide. Écrivez donc quelque chose pour le remplir !",
-  "empty_column.direct": "Vous n'avez pas encore de mentions privées. Quand vous en envoyez ou en recevez, elles apparaîtront ici.",
+  "empty_column.direct": "Vous n'avez pas encore de mentions privées. Quand vous en enverrez ou recevrez, elles apparaîtront ici.",
   "empty_column.domain_blocks": "Il n’y a aucun domaine bloqué pour le moment.",
   "empty_column.explore_statuses": "Rien n'est en tendance pour le moment. Revenez plus tard !",
   "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
   "notification.favourite.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont mis votre message en favori",
   "notification.follow": "{name} vous suit",
-  "notification.follow.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont abonné à votre compte",
+  "notification.follow.name_and_others": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> vous suivent",
   "notification.follow_request": "{name} a demandé à vous suivre",
   "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Répondre en privé",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
+  "notification.mentioned_you": "{name} vous a mentionné·e",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -542,12 +543,12 @@
   "notification_requests.confirm_accept_multiple.message": "Vous êtes sur le point d'accepter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Êtes-vous sûr de vouloir continuer ?",
   "notification_requests.confirm_accept_multiple.title": "Accepter les requêtes de notification ?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignorer la requête} other {Ignorer les requêtes}}",
-  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne serez plus en mesure d’{count, plural, one {y} other {y}} accéder facilement, ultérieurement. Êtes-vous sûr de vouloir continuer ?",
+  "notification_requests.confirm_dismiss_multiple.message": "Vous êtes sur le point de rejeter {count, plural, one {une requête de notification} other {# requêtes de notification}}. Vous ne pourrez plus {count, plural, one {y} other {y}} accéder facilement plus tard. Voulez-vous vraiment continuer ?",
   "notification_requests.confirm_dismiss_multiple.title": "Rejeter les requêtes de notification ?",
   "notification_requests.dismiss": "Rejeter",
   "notification_requests.dismiss_multiple": "{count, plural, one {Rejeter # requête …} other {Rejeter # requêtes …}}",
   "notification_requests.edit_selection": "Modifier",
-  "notification_requests.exit_selection": "Fait",
+  "notification_requests.exit_selection": "Terminé",
   "notification_requests.explainer_for_limited_account": "Les notifications en provenance de ce compte ont été filtrées car le compte a été limité par un modérateur.",
   "notification_requests.explainer_for_limited_remote_account": "Les notifications en provenance de ce compte ont été filtrées car le compte ou le serveur dont il est issu a été limité par un modérateur.",
   "notification_requests.maximize": "Agrandir",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barre de filtre rapide",
   "notifications.column_settings.follow": "Nouveaux·elles abonné·e·s :",
   "notifications.column_settings.follow_request": "Nouvelles demandes d’abonnement :",
+  "notifications.column_settings.group": "Grouper",
   "notifications.column_settings.mention": "Mentions :",
   "notifications.column_settings.poll": "Résultats des sondages :",
   "notifications.column_settings.push": "Notifications push",
@@ -852,6 +854,8 @@
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.audio_description": "Décrire pour les personnes ayant des difficultés d’audition",
   "upload_form.description": "Décrire pour les malvoyant·e·s",
+  "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fy.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Dataferkear beheind",
   "alert.unexpected.message": "Der is in ûnferwachte flater bard.",
   "alert.unexpected.title": "Oepsy!",
+  "alt_text_badge.title": "Alternative tekst",
   "announcement.announcement": "Oankundiging",
   "attachments_list.unprocessed": "(net ferwurke)",
   "audio.hide": "Audio ferstopje",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Net ien op dizze server kin jo folgje.",
   "domain_block_modal.they_wont_know": "Se krije net te witten dat se blokkearre wurde.",
   "domain_block_modal.title": "Domein blokkearje?",
+  "domain_block_modal.you_will_lose_num_followers": "Jo ferlieze {followersCount, plural, one {{followersCountDisplay} folger} other {{followersCountDisplay} folgers}} en {followingCount, plural, one {{followingCountDisplay} persoan dy’t jo folgje} other {{followingCountDisplay} persoanen dy’t jo folgje}}.",
+  "domain_block_modal.you_will_lose_relationships": "Jo ferlieze alle folgers en minsken dy’t jo folgje fan dizze server.",
   "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
   "domain_pill.activitypub_lets_connect": "It soarget derfoar dat jo net allinnich mar ferbine en kommunisearje kinne mei minsken op Mastodon, mar ek mei oare sosjale apps.",
   "domain_pill.activitypub_like_language": "ActivityPub is de taal dy’t Mastodon mei oare sosjale netwurken sprekt.",
@@ -433,6 +436,8 @@
   "lightbox.close": "Slute",
   "lightbox.next": "Folgjende",
   "lightbox.previous": "Foarige",
+  "lightbox.zoom_in": "Oarspronklike grutte toane",
+  "lightbox.zoom_out": "Passend toane",
   "limited_account_hint.action": "Profyl dochs besjen",
   "limited_account_hint.title": "Dit profyl is troch de behearders fan {domain} ferstoppe.",
   "link_preview.author": "Troch {name}",
@@ -454,6 +459,7 @@
   "lists.subheading": "Jo listen",
   "load_pending": "{count, plural, one {# nij item} other {# nije items}}",
   "loading_indicator.label": "Lade…",
+  "media_gallery.hide": "Ferstopje",
   "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
   "mute_modal.hide_from_notifications": "Meldingen ferstopje",
   "mute_modal.hide_options": "Opsjes ferstopje",
@@ -502,7 +508,6 @@
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
   "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
-  "notification.follow.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe jo folge",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
   "notification.follow_request.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe frege om jo te folgjen",
   "notification.label.mention": "Fermelding",
@@ -510,6 +515,7 @@
   "notification.label.private_reply": "Priveereaksje",
   "notification.label.reply": "Beäntwurdzje",
   "notification.mention": "Fermelding",
+  "notification.mentioned_you": "{name} hat dy fermeld",
   "notification.moderation-warning.learn_more": "Mear ynfo",
   "notification.moderation_warning": "Jo hawwe in moderaasje-warskôging ûntfongen",
   "notification.moderation_warning.action_delete_statuses": "Guon fan jo berjochten binne fuortsmiten.",
@@ -774,6 +780,7 @@
   "status.bookmark": "Blêdwizer tafoegje",
   "status.cancel_reblog_private": "Net langer booste",
   "status.cannot_reblog": "Dit berjocht kin net boost wurde",
+  "status.continued_thread": "Ferfolgje it petear",
   "status.copy": "Copy link to status",
   "status.delete": "Fuortsmite",
   "status.detailed_status": "Detaillearre petearoersjoch",
@@ -782,6 +789,7 @@
   "status.edit": "Bewurkje",
   "status.edited": "Lêst bywurke op {date}",
   "status.edited_x_times": "{count, plural, one {{count} kear} other {{count} kearen}} bewurke",
+  "status.embed": "Koade om op te nimmen",
   "status.favourite": "Favoryt",
   "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
   "status.filter": "Dit berjocht filterje",
@@ -806,6 +814,7 @@
   "status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
   "status.redraft": "Fuortsmite en opnij opstelle",
   "status.remove_bookmark": "Blêdwizer fuortsmite",
+  "status.replied_in_thread": "Antwurde yn petear",
   "status.replied_to": "Antwurde op {name}",
   "status.reply": "Beäntwurdzje",
   "status.replyAll": "Alle beäntwurdzje",
@@ -843,6 +852,11 @@
   "upload_error.poll": "It opladen fan bestannen is yn enkêten net tastien.",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",
+  "upload_form.drag_and_drop.instructions": "Druk op spaasje of Enter om in mediabylage op te pakken. Bruk de pylktoetsen om de bylage yn in bepaalde rjochting te ferpleatsen. Druk opnij op de spaasjebalke of Enter om de mediabylage op de nije posysje te pleatsen, of druk op Esc om te annulearjen.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Slepen is annulearre. Mediabylage {item} is net ferpleatst.",
+  "upload_form.drag_and_drop.on_drag_end": "Mediabylage {item} is net ferpleatst.",
+  "upload_form.drag_and_drop.on_drag_over": "Mediabylage {item} is ferpleatst.",
+  "upload_form.drag_and_drop.on_drag_start": "Mediabylage {item} is oppakt.",
   "upload_form.edit": "Bewurkje",
   "upload_form.thumbnail": "Miniatuerôfbylding wizigje",
   "upload_form.video_description": "Describe for people with hearing loss or visual impairment",

app/javascript/mastodon/locales/ga.json

@@ -508,7 +508,7 @@
   "notification.favourite": "Is fearr le {name} do phostáil",
   "notification.favourite.name_and_others_with_link": "{name} agus <a>{count, plural, one {# duine eile} other {# daoine eile}}</a> thaitin le do phost",
   "notification.follow": "Lean {name} thú",
-  "notification.follow.name_and_others": "{name} agus {count, plural, one {# duine eile} other {# daoine eile}} a lean tú",
+  "notification.follow.name_and_others": "{name} agus <a>{count, plural, one {# other} two {# eile} few {# eile} many {# eile} other {# others}}</a> lean tú",
   "notification.follow_request": "D'iarr {name} ort do chuntas a leanúint",
   "notification.follow_request.name_and_others": "{name} agus {count, plural, one {# duine eile} other {# daoine eile}} iarratas a dhéanamh chun tú a leanúint",
   "notification.label.mention": "Luaigh",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Freagra príobháideach",
   "notification.label.reply": "Freagra",
   "notification.mention": "Luaigh",
+  "notification.mentioned_you": "Luaigh {name} tú",
   "notification.moderation-warning.learn_more": "Foghlaim níos mó",
   "notification.moderation_warning": "Tá rabhadh modhnóireachta faighte agat",
   "notification.moderation_warning.action_delete_statuses": "Baineadh cuid de do phostálacha.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra scagairí tapa",
   "notifications.column_settings.follow": "Leantóirí nua:",
   "notifications.column_settings.follow_request": "Iarratais leanúnaí nua:",
+  "notifications.column_settings.group": "Grúpa",
   "notifications.column_settings.mention": "Tráchtanna:",
   "notifications.column_settings.poll": "Torthaí suirbhéanna:",
   "notifications.column_settings.push": "Brúfhógraí",

app/javascript/mastodon/locales/gd.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Cuingeachadh ùine",
   "alert.unexpected.message": "Thachair mearachd ris nach robh dùil.",
   "alert.unexpected.title": "Oich!",
+  "alt_text_badge.title": "Roghainn teacsa",
   "announcement.announcement": "Brath-fios",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Chan urrainn do neach sam bith a th’ air an fhrithealaiche seo do leantainn.",
   "domain_block_modal.they_wont_know": "Cha bhi fios aca gun deach am bacadh.",
   "domain_block_modal.title": "A bheil thu airson an àrainn a bhacadh?",
+  "domain_block_modal.you_will_lose_num_followers": "Caillidh tu {followersCount, plural, one {{followersCountDisplay} neach-leantainn} two {{followersCountDisplay} luchd-leantainn} few {{followersCountDisplay} luchd-leantainn} other {{followersCountDisplay} luchd-leantainn}} ’s {followingCount, plural, one {{followingCountDisplay} neach a tha thu a’ leantainn} two {{followingCountDisplay} daoine a tha thu a’ leantainn} few {{followingCountDisplay} daoine a tha thu a’ leantainn} other {{followingCountDisplay} daoine a tha thu a’ leantainn}}.",
+  "domain_block_modal.you_will_lose_relationships": "Caillidh tu a h-uile luchd-leantainn ’s neach a leanas tu air an fhrithealaiche seo.",
   "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
   "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
   "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
@@ -330,7 +333,7 @@
   "footer.about": "Mu dhèidhinn",
   "footer.directory": "Eòlaire nam pròifil",
   "footer.get_app": "Faigh an aplacaid",
-  "footer.invite": "Thoir cuireadh do dhaoine",
+  "footer.invite": "Thoir cuireadh",
   "footer.keyboard_shortcuts": "Ath-ghoiridean a’ mheur-chlàir",
   "footer.privacy_policy": "Poileasaidh prìobhaideachd",
   "footer.source_code": "Seall am bun-tùs",
@@ -505,7 +508,6 @@
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.favourite.name_and_others_with_link": "Is annsa le {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
-  "notification.follow.name_and_others": "Lean {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} thu",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.follow_request.name_and_others": "Dh’iarr {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} ’gad leantainn",
   "notification.label.mention": "Iomradh",
@@ -513,6 +515,7 @@
   "notification.label.private_reply": "Freagairt phrìobhaideach",
   "notification.label.reply": "Freagairt",
   "notification.mention": "Iomradh",
+  "notification.mentioned_you": "Thug {name} iomradh ort",
   "notification.moderation-warning.learn_more": "Barrachd fiosrachaidh",
   "notification.moderation_warning": "Fhuair thu rabhadh on mhaorsainneachd",
   "notification.moderation_warning.action_delete_statuses": "Chaidh cuid dhe na postaichean agad a thoirt air falbh.",
@@ -849,6 +852,11 @@
   "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
   "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
   "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
+  "upload_form.drag_and_drop.instructions": "Airson ceanglachan meadhain a thogail, brùth air space no enter. Fhad ’ a bhios tu ’ga shlaodadh, cleachd na h-iuchraichean-saighde airson an ceanglachan meadhain a ghluasad gu comhair sam bith. Brùth air space no enter a-rithist airson an ceanglachen meadhain a leigeil às air an ionad ùr aige no brùth air escape airson sgur dheth.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Chaidh sgur dhen t-slaodadh. Chaidh an ceanglachan meadhain {item} a leigeil às.",
+  "upload_form.drag_and_drop.on_drag_end": "Chaidh an ceanglachan meadhain {item} a leigeil às.",
+  "upload_form.drag_and_drop.on_drag_over": "Chaidh an ceanglachan meadhain {item} a ghluasad.",
+  "upload_form.drag_and_drop.on_drag_start": "Chaidh an ceanglachan meadhain {item} a thogail.",
   "upload_form.edit": "Deasaich",
   "upload_form.thumbnail": "Atharraich an dealbhag",
   "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",

app/javascript/mastodon/locales/gl.json

@@ -193,7 +193,7 @@
   "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
   "confirmations.reply.title": "Editar a publicación?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Desexas deixar de seguir a {name}?",
+  "confirmations.unfollow.message": "Tes certeza de querer deixar de seguir a {name}?",
   "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
   "content_warning.hide": "Agochar publicación",
   "content_warning.show": "Mostrar igualmente",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} marcou como favorita a túa publicación",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> favoreceron a túa publicación",
   "notification.follow": "{name} comezou a seguirte",
-  "notification.follow.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} seguíronte",
+  "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# mais} other {# mais}}</a> seguíronte",
   "notification.follow_request": "{name} solicitou seguirte",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} solicitaron seguirte",
   "notification.label.mention": "Mención",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Resposta privada",
   "notification.label.reply": "Resposta",
   "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} mencionoute",
   "notification.moderation-warning.learn_more": "Saber máis",
   "notification.moderation_warning": "Recibiches unha advertencia da moderación",
   "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Novas seguidoras:",
   "notifications.column_settings.follow_request": "Novas peticións de seguimento:",
+  "notifications.column_settings.group": "Agrupar",
   "notifications.column_settings.mention": "Mencións:",
   "notifications.column_settings.poll": "Resultados da enquisa:",
   "notifications.column_settings.push": "Notificacións emerxentes",

app/javascript/mastodon/locales/he.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "שרתים שנחסמו על ידי המנהלים",
+  "about.blocks": "שרתים מוגבלים",
   "about.contact": "יצירת קשר:",
   "about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "הסיבה אינה זמינה",
@@ -34,9 +34,9 @@
   "account.follow_back": "לעקוב בחזרה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
-  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{count} עוקבים}}",
+  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
   "account.following": "נעקבים",
-  "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {count}}}",
+  "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {counter}}}",
   "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
@@ -62,7 +62,7 @@
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
   "account.show_reblogs": "הצג הדהודים מאת @{name}",
-  "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
   "account.unblock": "להסיר חסימה ל- @{name}",
   "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
   "account.unblock_short": "הסר חסימה",
@@ -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,one {יאבד לך עוקב אחד}other {יאבדו לך {followersCountDisplay} עוקבים}} {followingCount, plural,one  {ונעקב אחד}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": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
@@ -346,9 +349,9 @@
   "hashtag.column_settings.tag_mode.any": "לפחות אחד מאלה",
   "hashtag.column_settings.tag_mode.none": "אף אחד מאלה",
   "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה",
-  "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{count} משתתפיםות}}",
+  "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{counter} משתתפיםות}}",
-  "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}} היום",
+  "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}} היום",
   "hashtag.follow": "לעקוב אחרי תגית",
   "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
   "hashtags.and_other": "…{count, plural,other {ועוד #}}",
@@ -439,7 +442,7 @@
   "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
   "link_preview.author": "מאת {name}",
   "link_preview.more_from_author": "עוד מאת {name}",
-  "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
   "lists.account.add": "הוסף לרשימה",
   "lists.account.remove": "הסר מרשימה",
   "lists.delete": "מחיקת רשימה",
@@ -505,7 +508,7 @@
   "notification.favourite": "הודעתך חובבה על ידי {name}",
   "notification.favourite.name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a> חיבבו את הודעתך",
   "notification.follow": "{name} במעקב אחרייך",
-  "notification.follow.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} עקבו אחריך",
+  "notification.follow.name_and_others": "{name} ועוד <a>{count, plural,one {מישהו} other {# אחרים}}</a> החלו לעקוב אחריך",
   "notification.follow_request": "{name} ביקשו לעקוב אחריך",
   "notification.follow_request.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} ביקשו לעקוב אחריך",
   "notification.label.mention": "אזכור",
@@ -513,6 +516,7 @@
   "notification.label.private_reply": "תשובה בפרטי",
   "notification.label.reply": "תשובה",
   "notification.mention": "אזכור",
+  "notification.mentioned_you": "אוזכרת על ידי {name}",
   "notification.moderation-warning.learn_more": "למידע נוסף",
   "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
   "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
@@ -563,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "שורת סינון מהיר",
   "notifications.column_settings.follow": "עוקבים חדשים:",
   "notifications.column_settings.follow_request": "בקשות מעקב חדשות:",
+  "notifications.column_settings.group": "קבוצה",
   "notifications.column_settings.mention": "פניות:",
   "notifications.column_settings.poll": "תוצאות סקר:",
   "notifications.column_settings.push": "התראות בדחיפה",
@@ -837,7 +842,7 @@
   "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
   "time_remaining.moments": "רגעים נותרו",
   "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
-  "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
+  "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{counter} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
   "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
   "units.short.billion": "{count} מליארד",
@@ -849,6 +854,11 @@
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
   "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
   "upload_form.description": "תיאור לכבדי ראיה",
+  "upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
+  "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": "תאר/י עבור לקויי שמיעה ולקויי ראייה",

app/javascript/mastodon/locales/hu.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Adatforgalom korlátozva",
   "alert.unexpected.message": "Váratlan hiba történt.",
   "alert.unexpected.title": "Hoppá!",
+  "alt_text_badge.title": "Helyettesítő szöveg",
   "announcement.announcement": "Közlemény",
   "attachments_list.unprocessed": "(feldolgozatlan)",
   "audio.hide": "Hang elrejtése",
@@ -507,7 +508,7 @@
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.favourite.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
-  "notification.follow.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} követni kezdett",
+  "notification.follow.name_and_others": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> követni kezdett",
   "notification.follow_request": "{name} követni szeretne téged",
   "notification.follow_request.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} kérte, hogy követhessen",
   "notification.label.mention": "Említés",
@@ -515,6 +516,7 @@
   "notification.label.private_reply": "Privát válasz",
   "notification.label.reply": "Válasz",
   "notification.mention": "Említés",
+  "notification.mentioned_you": "{name} megemlített",
   "notification.moderation-warning.learn_more": "További információ",
   "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
   "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
@@ -565,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Gyorsszűrő sáv",
   "notifications.column_settings.follow": "Új követők:",
   "notifications.column_settings.follow_request": "Új követési kérések:",
+  "notifications.column_settings.group": "Csoportosítás",
   "notifications.column_settings.mention": "Megemlítések:",
   "notifications.column_settings.poll": "Szavazási eredmények:",
   "notifications.column_settings.push": "Leküldéses értesítések",
@@ -851,6 +854,11 @@
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
   "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
   "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
+  "upload_form.drag_and_drop.instructions": "Egy médiamelléklet kiválasztásához nyomj Szóközt vagy Entert. Húzás közben használd a nyílgombokat a médiamelléklet adott irányba történő mozgatásához. A médiamelléklet új pozícióba helyezéséhez nyomd meg a Szóközt vagy az Entert, vagy a megszakításhoz nyomd meg az Esc gombot.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Az áthúzás megszakítva. A(z) {item} médiamelléklet el lett dobva.",
+  "upload_form.drag_and_drop.on_drag_end": "A(z) {item} médiamelléklet el lett dobva.",
+  "upload_form.drag_and_drop.on_drag_over": "A(z) {item} médiamelléklet át lett helyezve.",
+  "upload_form.drag_and_drop.on_drag_start": "A(z) {item} médiamelléklet fel lett véve.",
   "upload_form.edit": "Szerkesztés",
   "upload_form.thumbnail": "Bélyegkép megváltoztatása",
   "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",

app/javascript/mastodon/locales/ia.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Excesso de requestas",
   "alert.unexpected.message": "Un error inexpectate ha occurrite.",
   "alert.unexpected.title": "Ups!",
+  "alt_text_badge.title": "Texto alt",
   "announcement.announcement": "Annuncio",
   "attachments_list.unprocessed": "(non processate)",
   "audio.hide": "Celar audio",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Necuno de iste servitor pote sequer te.",
   "domain_block_modal.they_wont_know": "Ille non sapera que ille ha essite blocate.",
   "domain_block_modal.title": "Blocar dominio?",
+  "domain_block_modal.you_will_lose_num_followers": "Tu perdera {followersCount, plural, one {{followersCountDisplay} sequace} other {{followersCountDisplay} sequaces}} e {followingCount, plural, one {{followingCountDisplay} persona que tu seque} other {{followingCountDisplay} personas que tu seque}}.",
+  "domain_block_modal.you_will_lose_relationships": "Tu perdera tote le sequaces e le personas que tu seque ab iste servitor.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes de usatores sur iste servitor.",
   "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
   "domain_pill.activitypub_like_language": "ActivityPub es como le linguage commun que Mastodon parla con altere retes social.",
@@ -303,6 +306,7 @@
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
   "filter_warning.matches_filter": "Corresponde al filtro “{title}”",
+  "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nemo} one {un persona} other {# personas}} que tu pote cognoscer",
   "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
   "firehose.local": "Iste servitor",
@@ -351,6 +355,9 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.unfollow": "Non sequer plus le hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {# plus}}",
+  "hints.profiles.followers_may_be_missing": "Le sequaces pro iste profilo pote mancar.",
+  "hints.profiles.follows_may_be_missing": "Sequites pro iste profilo pote mancar.",
+  "hints.profiles.posts_may_be_missing": "Alcun messages ab iste profilo pote mancar.",
   "hints.profiles.see_more_followers": "Vider plus de sequitores sur {domain}",
   "hints.profiles.see_more_follows": "Vider plus de sequites sur {domain}",
   "hints.profiles.see_more_posts": "Vider plus de messages sur {domain}",
@@ -363,6 +370,11 @@
   "home.pending_critical_update.link": "Vider actualisationes",
   "home.pending_critical_update.title": "Actualisation de securitate critic disponibile!",
   "home.show_announcements": "Monstrar annuncios",
+  "ignore_notifications_modal.disclaimer": "Mastodon non pote informar le usatores que tu ha ignorate lor avisos. Ignorar avisos non stoppara le messages mesme de esser inviate.",
+  "ignore_notifications_modal.filter_instead": "Filtrar in vice",
+  "ignore_notifications_modal.filter_to_act_users": "Tu ancora potera acceptar, rejectar, o reportar usatores",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar adjuta evitar confusion potential",
+  "ignore_notifications_modal.filter_to_review_separately": "Tu pote revider avisos filtrate separatemente",
   "ignore_notifications_modal.ignore": "Ignorar le notificationes",
   "ignore_notifications_modal.limited_accounts_title": "Ignorar le notificationes de contos moderate?",
   "ignore_notifications_modal.new_accounts_title": "Ignorar le notificationes de nove contos?",
@@ -424,6 +436,8 @@
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
+  "lightbox.zoom_in": "Aggrandir a dimension actual",
+  "lightbox.zoom_out": "Aggrandir pro adaptar",
   "limited_account_hint.action": "Monstrar profilo in omne caso",
   "limited_account_hint.title": "Iste profilo ha essite celate per le moderatores de {domain}.",
   "link_preview.author": "Per {name}",
@@ -490,14 +504,18 @@
   "notification.admin.report_statuses": "{name} ha reportate {target} pro {category}",
   "notification.admin.report_statuses_other": "{name} ha reportate {target}",
   "notification.admin.sign_up": "{name} se ha inscribite",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# altere usator} other {altere # usatores}} se inscribeva",
   "notification.favourite": "{name} ha marcate tu message como favorite",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a> favoriva tu message",
   "notification.follow": "{name} te ha sequite",
   "notification.follow_request": "{name} ha requestate de sequer te",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# altere} other {# alteres}} ha demandate de sequer te",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention private",
   "notification.label.private_reply": "Responsa private",
   "notification.label.reply": "Responder",
   "notification.mention": "Mention",
+  "notification.mentioned_you": "{name} te mentionava",
   "notification.moderation-warning.learn_more": "Apprender plus",
   "notification.moderation_warning": "Tu ha recipite un advertimento de moderation",
   "notification.moderation_warning.action_delete_statuses": "Alcunes de tu messages ha essite removite.",
@@ -510,6 +528,7 @@
   "notification.own_poll": "Tu sondage ha finite",
   "notification.poll": "Un sondage in le qual tu ha votate ha finite",
   "notification.reblog": "{name} ha impulsate tu message",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a> promoveva tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrator de {from} ha suspendiute {target}. Isto significa que tu non pote plus reciper actualisationes de iste persona o interager con ille.",
   "notification.relationships_severance_event.domain_block": "Un administrator de {from} ha blocate {target}, includente {followersCount} de tu sequitores e {followingCount, plural, one {# conto} other {# contos}} que tu seque.",
@@ -518,11 +537,21 @@
   "notification.status": "{name} ha justo ora publicate",
   "notification.update": "{name} ha modificate un message",
   "notification_requests.accept": "Acceptar",
+  "notification_requests.accept_multiple": "{count, plural, one {Accepta # requesta…} other {Accepta # requestas…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accepta requesta} other {Accepta requestas}}",
+  "notification_requests.confirm_accept_multiple.message": "Tu acceptara {count, plural, one {un requesta de aviso} other {# requestas de aviso}}. Desira tu vermente continuar?",
   "notification_requests.confirm_accept_multiple.title": "Acceptar petitiones de notification?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Rejectar requesta} other {Rejectar requestas}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Tu rejectara {count, plural, one {un requesta de aviso} other {# requestas de aviso}}. Tu non potera facilemente acceder {count, plural, one {lo} other {los}} ancora. Desira tu vermente continuar?",
   "notification_requests.confirm_dismiss_multiple.title": "Dimitter petitiones de notification?",
   "notification_requests.dismiss": "Clauder",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Rejectar # requesta…} other {Rejectar # requestas…}}",
   "notification_requests.edit_selection": "Modificar",
   "notification_requests.exit_selection": "Facite",
+  "notification_requests.explainer_for_limited_account": "Le avisos ab iste conto ha essite filtrate perque le conto ha essite limitate per un moderator.",
+  "notification_requests.explainer_for_limited_remote_account": "Le avisos ab iste conto ha essite filtrate perque le conto o su servitor ha essite limitate per un moderator.",
+  "notification_requests.maximize": "Maximisar",
+  "notification_requests.minimize_banner": "Minimisar le bandiera del avisos filtrate",
   "notification_requests.notifications_from": "Notificationes de {name}",
   "notification_requests.title": "Notificationes filtrate",
   "notification_requests.view": "Vider notificationes",
@@ -562,8 +591,11 @@
   "notifications.permission_required": "Le notificationes de scriptorio es indisponibile perque le permission necessari non ha essite concedite.",
   "notifications.policy.accept": "Acceptar",
   "notifications.policy.accept_hint": "Monstrar in le notificationes",
+  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop_hint": "Inviar al nihil, pro jammais esser vidite ancora",
   "notifications.policy.filter": "Filtrar",
   "notifications.policy.filter_hint": "Inviar al cassa de notificationes filtrate",
+  "notifications.policy.filter_limited_accounts_hint": "Limitate per moderatores de servitor",
   "notifications.policy.filter_limited_accounts_title": "Contos moderate",
   "notifications.policy.filter_new_accounts.hint": "Create in le ultime {days, plural, one {die} other {# dies}}",
   "notifications.policy.filter_new_accounts_title": "Nove contos",
@@ -700,6 +732,7 @@
   "report.unfollow_explanation": "Tu seque iste conto. Pro non plus vider su messages in tu fluxo de initio, cessa de sequer lo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message} other {{count} messages}} annexate",
   "report_notification.categories.legal": "Juridic",
+  "report_notification.categories.legal_sentence": "contento illegal",
   "report_notification.categories.other": "Alteres",
   "report_notification.categories.other_sentence": "alteres",
   "report_notification.categories.spam": "Spam",
@@ -747,6 +780,7 @@
   "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
+  "status.continued_thread": "Argumento continuitate",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
   "status.detailed_status": "Vista detaliate del conversation",
@@ -755,6 +789,7 @@
   "status.edit": "Modificar",
   "status.edited": "Ultime modification le {date}",
   "status.edited_x_times": "Modificate {count, plural, one {{count} vice} other {{count} vices}}",
+  "status.embed": "Obtener codice incorporate",
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
@@ -817,6 +852,11 @@
   "upload_error.poll": "Incargamento de files non permittite con sondages.",
   "upload_form.audio_description": "Describe lo pro le gente con difficultates auditive",
   "upload_form.description": "Describe lo pro le gente con difficultates visual",
+  "upload_form.drag_and_drop.instructions": "Pro colliger un annexo de medios, pressar Spatio o Inviar. Trahente lo, usar le claves flecha pro mover le annexo de medios in ulle direction date. De novo pressar Spatio o Inviar pro deponer le annexo de medios in su nove position, o pressar Escappar pro cancellar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Le extraction era cancellate. Le annexo de medios {item} era deponite.",
+  "upload_form.drag_and_drop.on_drag_end": "Le annexo de medios {item} era deponite.",
+  "upload_form.drag_and_drop.on_drag_over": "Le annexo de medios {item} era movite.",
+  "upload_form.drag_and_drop.on_drag_start": "Annexo de medios {item} colligite.",
   "upload_form.edit": "Modificar",
   "upload_form.thumbnail": "Cambiar le miniatura",
   "upload_form.video_description": "Describe lo pro le gente con difficultates auditive o visual",

app/javascript/mastodon/locales/io.json

@@ -508,7 +508,6 @@
   "notification.favourite": "{name} favorizis tua mesajo",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural,one {# altru} other {# altri}}</a> favorizis vua posto",
   "notification.follow": "{name} sequeskis tu",
-  "notification.follow.name_and_others": "{name} e {count, plural,one {# altru} other {#altri}} sequis vu",
   "notification.follow_request": "{name} demandas sequar vu",
   "notification.follow_request.name_and_others": "{name} e {count, plural,one {# altru} other {# altri}} volas sequar vu",
   "notification.label.mention": "Mencionez",

app/javascript/mastodon/locales/is.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Með takmörkum",
   "alert.unexpected.message": "Upp kom óvænt villa.",
   "alert.unexpected.title": "Úbbs!",
+  "alt_text_badge.title": "Hjálpartexti mynda",
   "announcement.announcement": "Auglýsing",
   "attachments_list.unprocessed": "(óunnið)",
   "audio.hide": "Fela hljóð",
@@ -221,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Enginn frá þessum netþjóni getur fylgst með þér.",
   "domain_block_modal.they_wont_know": "Viðkomandi mun ekki vita að hann hafi verið útilokaður.",
   "domain_block_modal.title": "Útiloka lén?",
+  "domain_block_modal.you_will_lose_num_followers": "Þú munt missa {followersCount, plural, one {{followersCountDisplay} fylgjanda} other {{followersCountDisplay} fylgjendur}} og {followingCount, plural, one {{followingCountDisplay} aðila sem þú fylgist með} other {{followingCountDisplay} aðila sem þú fylgist með}}.",
+  "domain_block_modal.you_will_lose_relationships": "Þú munt missa alla fylgjendur og þá sem þú fylgist með á þessum netþjóni.",
   "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
   "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
   "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
@@ -433,6 +436,8 @@
   "lightbox.close": "Loka",
   "lightbox.next": "Næsta",
   "lightbox.previous": "Fyrra",
+  "lightbox.zoom_in": "Renna að raunstærð",
+  "lightbox.zoom_out": "Renna að svo passi",
   "limited_account_hint.action": "Birta notandasniðið samt",
   "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.",
   "link_preview.author": "Frá {name}",
@@ -503,7 +508,7 @@
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> sett færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
-  "notification.follow.name_and_others": "{name} og {count, plural, one {# í viðbót fylgdist} other {# í viðbót fylgdust}} með þér",
+  "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# í viðbót fylgdist} other {# í viðbót fylgdust}}</a> með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
   "notification.follow_request.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} beðið um að fylgjast með þér",
   "notification.label.mention": "Minnst á",
@@ -511,6 +516,7 @@
   "notification.label.private_reply": "Einkasvar",
   "notification.label.reply": "Svara",
   "notification.mention": "Minnst á",
+  "notification.mentioned_you": "{name} minntist á þig",
   "notification.moderation-warning.learn_more": "Kanna nánar",
   "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
   "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
@@ -561,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Skyndisíustika",
   "notifications.column_settings.follow": "Nýir fylgjendur:",
   "notifications.column_settings.follow_request": "Nýjar beiðnir um að fylgjast með:",
+  "notifications.column_settings.group": "Hópur",
   "notifications.column_settings.mention": "Tilvísanir:",
   "notifications.column_settings.poll": "Niðurstöður könnunar:",
   "notifications.column_settings.push": "Ýti-tilkynningar",
@@ -847,6 +854,11 @@
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
   "upload_form.audio_description": "Lýstu þessu fyrir heyrnarskerta",
   "upload_form.description": "Lýstu þessu fyrir sjónskerta",
+  "upload_form.drag_and_drop.instructions": "Til að taka í myndefnisviðhengi skaltu ýta á bilslána eða Enter. Til að draga geturðu notað örvalyklana til að færa viðhengið í samsvarandi áttir. Ýttu aftur á bilslána eða Enter til að sleppa viðhenginu á nýja staðinn, eða ýttu á Escape til að hætta við.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Hætt var við að draga. Myndefnisviðhenginu {item} var sleppt.",
+  "upload_form.drag_and_drop.on_drag_end": "Myndefnisviðhenginu {item} var sleppt.",
+  "upload_form.drag_and_drop.on_drag_over": "Myndefnisviðhengið {item} var fært.",
+  "upload_form.drag_and_drop.on_drag_start": "Tók í myndefnisviðhengið {item}.",
   "upload_form.edit": "Breyta",
   "upload_form.thumbnail": "Skipta um smámynd",
   "upload_form.video_description": "Lýstu þessu fyrir fólk sem heyrir illa eða er með skerta sjón",

app/javascript/mastodon/locales/it.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altro} other {altri #}}</a> hanno aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
-  "notification.follow.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno iniziato a seguirti",
+  "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# altro} other {altri #}}</a> hanno iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno richiesto di seguirti",
   "notification.label.mention": "Menziona",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Rispondi in privato",
   "notification.label.reply": "Rispondi",
   "notification.mention": "Menziona",
+  "notification.mentioned_you": "{name} ti ha menzionato",
   "notification.moderation-warning.learn_more": "Scopri di più",
   "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
   "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
   "notifications.column_settings.follow": "Nuovi seguaci:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
+  "notifications.column_settings.group": "Gruppo",
   "notifications.column_settings.mention": "Menzioni:",
   "notifications.column_settings.poll": "Risultati del sondaggio:",
   "notifications.column_settings.push": "Notifiche push",
@@ -852,6 +854,11 @@
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
   "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
   "upload_form.description": "Descrizione per ipovedenti",
+  "upload_form.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
+  "upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",
+  "upload_form.drag_and_drop.on_drag_over": "L'allegato multimediale {item} è stato spostato.",
+  "upload_form.drag_and_drop.on_drag_start": "L'allegato multimediale {item} è stato ricevuto.",
   "upload_form.edit": "Modifica",
   "upload_form.thumbnail": "Cambia la miniatura",
   "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",

app/javascript/mastodon/locales/ja.json

@@ -97,6 +97,7 @@
   "alert.rate_limited.title": "制限に達しました",
   "alert.unexpected.message": "不明なエラーが発生しました。",
   "alert.unexpected.title": "エラー！",
+  "alt_text_badge.title": "代替テキスト",
   "announcement.announcement": "お知らせ",
   "antennas.account.add": "アンテナに追加",
   "antennas.account.remove": "アンテナから外す",
@@ -309,6 +310,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": "「{followingCount, plural, other {{followingCountDisplay}フォロー}}」、「{followersCount, plural, other {{followersCountDisplay}フォロワー}}」を失うことになります。",
+  "domain_block_modal.you_will_lose_relationships": "このサーバーにいるすべてのフォローとフォロワーを失うことになります。",
   "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
   "domain_pill.activitypub_lets_connect": "Mastodonからほかのソーシャルアプリのユーザーへ、そのまた別のアプリのユーザーへと、それぞれが互いにつながり関わり合うことをこのActivityPubの仕組みが実現しています。",
   "domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
@@ -611,7 +614,6 @@
   "notification.favourite": "{name}さんがお気に入りしました",
   "notification.favourite.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
-  "notification.follow.name_and_others": "{name}さんほか{count, plural, other {#人}}にフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
   "notification.follow_request.name_and_others": "{name}さんほか{count, plural, other {#人}}があなたにフォローリクエストしました",
   "notification.label.mention": "メンション",
@@ -620,6 +622,7 @@
   "notification.label.reply": "返信",
   "notification.list_status": "{name}さんの投稿が{listName}に追加されました",
   "notification.mention": "メンション",
+  "notification.mentioned_you": "{name} さんがあなたに返信しました",
   "notification.moderation-warning.learn_more": "さらに詳しく",
   "notification.moderation_warning": "管理者から警告が来ています",
   "notification.moderation_warning.action_delete_statuses": "あなたによるいくつかの投稿が削除されました。",
@@ -920,6 +923,7 @@
   "status.cancel_reblog": "ブースト解除",
   "status.cancel_reblog_private": "ブースト解除",
   "status.cannot_reblog": "この投稿はブーストできません",
+  "status.continued_thread": "続きのスレッド",
   "status.copy": "投稿へのリンクをコピー",
   "status.delete": "削除",
   "status.detailed_status": "詳細な会話ビュー",
@@ -970,6 +974,7 @@
   "status.redraft": "削除して下書きに戻す",
   "status.reference": "ひかえめな引用",
   "status.remove_bookmark": "ブックマークを削除",
+  "status.replied_in_thread": "ほかのユーザーへ",
   "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",
   "status.replyAll": "全員に返信",
@@ -1007,6 +1012,11 @@
   "upload_error.poll": "アンケートではファイルをアップロードできません。",
   "upload_form.audio_description": "聴き取りが難しいユーザーへの説明",
   "upload_form.description": "視覚的に閲覧が難しいユーザーへの説明",
+  "upload_form.drag_and_drop.instructions": "メディア添付ファイルを選択するには、スペースキーまたはエンターキーを押してください。ドラッグ中は、矢印キーを使ってメディア添付ファイルを任意の方向に移動できます。再度スペースキーまたはエンターキーを押すと新しい位置にメディア添付ファイルをドロップできます。キャンセルするにはエスケープキーを押してください。",
+  "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": "聴き取りや視覚的に閲覧が難しいユーザーへの説明",

app/javascript/mastodon/locales/kab.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Ulac agbur",
+  "about.blocks": "Iqeddacen yettwaɛassen",
   "about.contact": "Anermis:",
   "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ulac taɣẓint",
@@ -278,6 +278,8 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
   "hashtag.follow": "Ḍfeṛ ahacṭag",
   "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
+  "hints.threads.replies_may_be_missing": "Tiririyin d-yusan deg iqeddacen nniḍen, yezmer ur d-ddant ara.",
+  "hints.threads.see_more": "Wali ugar n tririt deg {domain}",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
@@ -550,6 +552,7 @@
   "report_notification.attached_statuses": "{count, plural, one {{count} n tsuffeɣt} other {{count} n tsuffiɣin}} ttwaqnent",
   "report_notification.categories.legal": "Azerfan",
   "report_notification.categories.other": "Ayen nniḍen",
+  "report_notification.categories.other_sentence": "ayen nniḍen",
   "report_notification.categories.spam": "Aspam",
   "report_notification.categories.spam_sentence": "aspam",
   "report_notification.open": "Ldi aneqqis",
@@ -584,11 +587,13 @@
   "status.bookmark": "Creḍ",
   "status.cancel_reblog_private": "Sefsex beṭṭu",
   "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
+  "status.continued_thread": "Asqerdec yettkemmil",
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
   "status.direct": "Bder-d @{name} weḥd-s",
   "status.direct_indicator": "Abdar uslig",
   "status.edit": "Ẓreg",
+  "status.edited": "Taẓrigt taneggarut {date}",
   "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
   "status.embed": "Awi-d tangalt n weslaɣ",
   "status.favourite": "Amenyaf",
@@ -614,9 +619,10 @@
   "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tɛiwdeḍ tira",
   "status.remove_bookmark": "Kkes tacreḍt",
+  "status.replied_in_thread": "Y·t·erra-d deg usqerdec",
   "status.replied_to": "Y·terra-yas i {name}",
   "status.reply": "Err",
-  "status.replyAll": "Err i lxiḍ",
+  "status.replyAll": "Err i wesqerdec",
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",

app/javascript/mastodon/locales/ko.json

@@ -317,7 +317,7 @@
   "follow_suggestions.curated_suggestion": "스태프의 추천",
   "follow_suggestions.dismiss": "다시 보지 않기",
   "follow_suggestions.featured_longer": "{domain} 팀이 손수 고름",
-  "follow_suggestions.friends_of_friends_longer": "내가 팔로우 하는 사람들 사이에서 인기",
+  "follow_suggestions.friends_of_friends_longer": "내가 팔로우한 사람들 사이에서 인기",
   "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
   "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
   "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
@@ -499,7 +499,7 @@
   "navigation_bar.security": "보안",
   "not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
   "notification.admin.report": "{name} 님이 {target}를 신고했습니다",
-  "notification.admin.report_account": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 {category}로 신고했습니다",
+  "notification.admin.report_account": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 {category} 사유로 신고했습니다",
   "notification.admin.report_account_other": "{name} 님이 {target}의 게시물 {count, plural, other {# 개}}를 신고했습니다",
   "notification.admin.report_statuses": "{name} 님이 {target}을 {category}로 신고했습니다",
   "notification.admin.report_statuses_other": "{name} 님이 {target}을 신고했습니다",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} 님이 내 게시물을 좋아합니다",
   "notification.favourite.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 좋아합니다",
   "notification.follow": "{name} 님이 나를 팔로우했습니다",
-  "notification.follow.name_and_others": "{name} 외 {count, plural, other {# 명}}이 날 팔로우 했습니다",
+  "notification.follow.name_and_others": "{name} 외 {count, plural, other {# 명}}이 날 팔로우했습니다",
   "notification.follow_request": "{name} 님이 팔로우 요청을 보냈습니다",
   "notification.follow_request.name_and_others": "{name} 외 {count, plural, other {# 명}}이 나에게 팔로우 요청을 보냈습니다",
   "notification.label.mention": "멘션",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "개인 답글",
   "notification.label.reply": "답글",
   "notification.mention": "멘션",
+  "notification.mentioned_you": "{name} 님의 멘션",
   "notification.moderation-warning.learn_more": "더 알아보기",
   "notification.moderation_warning": "중재 경고를 받았습니다",
   "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "빠른 필터 막대",
   "notifications.column_settings.follow": "새 팔로워:",
   "notifications.column_settings.follow_request": "새 팔로우 요청:",
+  "notifications.column_settings.group": "그룹화",
   "notifications.column_settings.mention": "멘션:",
   "notifications.column_settings.poll": "설문 결과:",
   "notifications.column_settings.push": "푸시 알림",

app/javascript/mastodon/locales/lad.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Trafiko limitado",
   "alert.unexpected.message": "Afito un yerro no asperado.",
   "alert.unexpected.title": "Atyo!",
+  "alt_text_badge.title": "Teksto alternativo",
   "announcement.announcement": "Pregon",
   "attachments_list.unprocessed": "(no prosesado)",
   "audio.hide": "Eskonde audio",
@@ -334,6 +335,11 @@
   "hashtag.follow": "Sige etiketa",
   "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
+  "hints.profiles.see_more_followers": "Ve mas suivantes en {domain}",
+  "hints.profiles.see_more_follows": "Ve mas segidos en {domain}",
+  "hints.profiles.see_more_posts": "Ve mas puvlikasyones en {domain}",
+  "hints.threads.replies_may_be_missing": "Puede mankar repuestas de otros sirvidores.",
+  "hints.threads.see_more": "Ve mas repuestas en {domain}",
   "home.column_settings.show_reblogs": "Amostra repartajasyones",
   "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
@@ -342,6 +348,10 @@
   "home.pending_critical_update.title": "Aktualizasyon de seguridad kritika esta desponivle!",
   "home.show_announcements": "Amostra pregones",
   "ignore_notifications_modal.ignore": "Inyora avizos",
+  "ignore_notifications_modal.limited_accounts_title": "Inyorar avizos de kuentos moderados?",
+  "ignore_notifications_modal.new_accounts_title": "Inyorar avizos de kuentos muevos?",
+  "ignore_notifications_modal.not_followers_title": "Inyorar avizos de personas a las kualas no te sigen?",
+  "ignore_notifications_modal.not_following_title": "Inyorar avizos de personas a las kualas no siges?",
   "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
   "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
   "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
@@ -465,6 +475,7 @@
   "notification.label.private_mention": "Enmentadura privada",
   "notification.label.reply": "Arisponde",
   "notification.mention": "Enmenta",
+  "notification.mentioned_you": "{name} te enmento",
   "notification.moderation-warning.learn_more": "Ambezate mas",
   "notification.moderation_warning.action_disable": "Tu kuento tiene sido inkapasitado.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Algunas de tus publikasyones tienen sido markadas komo sensivles.",
@@ -482,6 +493,7 @@
   "notification_requests.dismiss": "Kita",
   "notification_requests.edit_selection": "Edita",
   "notification_requests.exit_selection": "Fecho",
+  "notification_requests.maximize": "Maksimizar",
   "notification_requests.notifications_from": "Avizos de {name}",
   "notification_requests.title": "Avizos filtrados",
   "notification_requests.view": "Amostra avizos",
@@ -496,6 +508,7 @@
   "notifications.column_settings.filter_bar.category": "Vara de filtrado rapido",
   "notifications.column_settings.follow": "Muevos suivantes:",
   "notifications.column_settings.follow_request": "Muevas solisitudes de segimiento:",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Enmentaduras:",
   "notifications.column_settings.poll": "Rizultados de anketas:",
   "notifications.column_settings.push": "Avizos arrepushados",
@@ -523,6 +536,7 @@
   "notifications.policy.accept_hint": "Amostra en avizos",
   "notifications.policy.drop": "Inyora",
   "notifications.policy.filter": "Filtra",
+  "notifications.policy.filter_limited_accounts_title": "Kuentos moderados",
   "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
   "notifications.policy.filter_new_accounts_title": "Muevos kuentos",
   "notifications.policy.filter_not_followers_title": "Personas ke te no sigen",
@@ -655,6 +669,7 @@
   "report.unfollow_explanation": "Estas sigiendo este kuento. Para no ver sus publikasyones en tu linya de tiempo, puedes deshar de segirlo.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publikasyon} other {{count} publikasyones}} atadas",
   "report_notification.categories.legal": "Legal",
+  "report_notification.categories.legal_sentence": "kontenido ilegal",
   "report_notification.categories.other": "Otros",
   "report_notification.categories.other_sentence": "otros",
   "report_notification.categories.spam": "Spam",
@@ -729,6 +744,7 @@
   "status.reblogs.empty": "Ainda nadie tiene repartajado esta publikasyon. Kuando algien lo aga, se amostrara aki.",
   "status.redraft": "Efasa i eskrive de muevo",
   "status.remove_bookmark": "Kita markador",
+  "status.replied_in_thread": "Arispondo en filo",
   "status.replied_to": "Arispondio a {name}",
   "status.reply": "Arisponde",
   "status.replyAll": "Arisponde al filo",

app/javascript/mastodon/locales/lt.json

@@ -506,6 +506,7 @@
   "notification.admin.sign_up": "{name} užsiregistravo",
   "notification.favourite": "{name} pamėgo tavo įrašą",
   "notification.follow": "{name} seka tave",
+  "notification.follow.name_and_others": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a> seka tave",
   "notification.follow_request": "{name} paprašė tave sekti",
   "notification.label.mention": "Paminėjimas",
   "notification.label.private_mention": "Privatus paminėjimas",
@@ -559,6 +560,7 @@
   "notifications.column_settings.filter_bar.category": "Spartaus filtro juosta",
   "notifications.column_settings.follow": "Nauji sekėjai:",
   "notifications.column_settings.follow_request": "Nauji sekimo prašymai:",
+  "notifications.column_settings.group": "Grupė",
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
   "notifications.column_settings.push": "Tiesioginiai pranešimai",

app/javascript/mastodon/locales/ml.json

@@ -5,19 +5,25 @@
   "about.domain_blocks.silenced.title": "പരിമിതമായത്",
   "about.domain_blocks.suspended.title": "താൽക്കാലികമായി നിർത്തിവെച്ചിരിക്കുന്നു",
   "about.rules": "സെർവ്വർ നിയമങ്ങൾ",
+  "account.account_note_header": "സ്വകാര്യ കുറിപ്പു്",
   "account.add_or_remove_from_list": "പട്ടികയിൽ ചേർക്കുകയോ/മാറ്റുകയോ ചെയ്യുക",
   "account.badges.bot": "റോബോട്ട്",
   "account.badges.group": "ഗ്രൂപ്പ്",
   "account.block": "@{name} -നെ തടയുക",
   "account.block_domain": "{domain} എന്ന മേഖല തടയുക",
+  "account.block_short": "തടസ്സപെടുത്തുക",
   "account.blocked": "തടഞ്ഞു",
   "account.cancel_follow_request": "Withdraw follow request",
+  "account.copy": "രൂപരേഖയിന്റെ വിലാസം പകർത്തുക",
+  "account.direct": "സ്വകാരൃമായിട്ടു് @{name}-ന് സൂചനപിക്കുക",
   "account.disable_notifications": "@{name} പോസ്റ്റുചെയ്യുന്നത് എന്നെ അറിയിക്കുന്നത് നിർത്തുക",
   "account.domain_blocked": "മേഖല തടഞ്ഞു",
   "account.edit_profile": "പ്രൊഫൈൽ തിരുത്തുക",
   "account.enable_notifications": "@{name} പോസ്റ്റ് ചെയ്യുമ്പോൾ എന്നെ അറിയിക്കുക",
   "account.endorse": "പ്രൊഫൈലിൽ പ്രകടമാക്കുക",
+  "account.featured_tags.last_status_never": "എഴുത്തുകളില്ല",
   "account.follow": "പിന്തുടരുക",
+  "account.follow_back": "തിരിച്ചു പിന്തുടരുക",
   "account.followers": "പിന്തുടരുന്നവർ",
   "account.followers.empty": "ഈ ഉപയോക്താവിനെ ആരും ഇതുവരെ പിന്തുടരുന്നില്ല.",
   "account.following": "പിന്തുടരുന്നു",
@@ -31,7 +37,11 @@
   "account.media": "മീഡിയ",
   "account.mention": "@{name} സൂചിപ്പിക്കുക",
   "account.mute": "@{name}-നെ(യെ) നിശ്ശബ്ദമാക്കൂ",
+  "account.mute_notifications_short": "അറിയിപ്പുകൾ മിണ്ടാതാക്കുക",
+  "account.mute_short": "മിണ്ടാതാക്കുക",
   "account.muted": "നിശ്ശബ്ദമാക്കിയിരിക്കുന്നു",
+  "account.no_bio": "വിവരണം നല്കുിയിട്ടില്ല.",
+  "account.open_original_page": "ആദ്യത്തു് താൾ തുറക്കുക",
   "account.posts": "പോസ്റ്റുകൾ",
   "account.posts_with_replies": "പോസ്റ്റുകളും മറുപടികളും",
   "account.report": "റിപ്പോർട്ട് ചെയ്യുക @{name}",
@@ -52,10 +62,16 @@
   "alert.rate_limited.title": "തോത് പരിമിതപ്പെടുത്തിയിരിക്കുന്നു",
   "alert.unexpected.message": "അപ്രതീക്ഷിതമായി എന്തോ സംഭവിച്ചു.",
   "alert.unexpected.title": "ശ്ശോ!",
+  "alt_text_badge.title": "പകരമായ വരി",
   "announcement.announcement": "അറിയിപ്പ്",
   "attachments_list.unprocessed": "(പ്രോസസ്സ് ചെയ്യാത്തത്)",
   "audio.hide": "ശബ്ദം ഒഴിവാക്കുക",
+  "block_modal.show_less": "കുറച്ചു് കാണിക്കുക",
+  "block_modal.show_more": "ഇനിയും കാണിക്കുക",
+  "block_modal.title": "ഉപയോക്താവിനു് തടസ്സപെടുത്തുക?",
   "boost_modal.combo": "അടുത്ത തവണ ഇത് ഒഴിവാക്കുവാൻ {combo} ഞെക്കാവുന്നതാണ്",
+  "bundle_column_error.copy_stacktrace": "പിഴരേഖ പകർത്തുക",
+  "bundle_column_error.error.title": "അയ്യോ!",
   "bundle_column_error.network.title": "നെറ്റ്‍വർക്ക് പിശക്",
   "bundle_column_error.retry": "വീണ്ടും ശ്രമിക്കുക",
   "bundle_column_error.return": "ഹോം പേജിലേക്ക് മടങ്ങാം",
@@ -66,14 +82,16 @@
   "closed_registrations.other_server_instructions": "Mastodon വികേന്ദ്രീകൃത സംവിധാനം ആയതിനാൽ, നിങ്ങൾക്ക് മറ്റൊരു സെർവറിൽ ഒരു അക്കൗണ്ട് ഉണ്ടാക്കിയും ഇതുമായി ആശയവിനിമയം നടത്താൻ സാധിക്കുന്നതാണ്.",
   "closed_registrations_modal.description": "{domain} ഇൽ ഇപ്പോൾ അക്കൗണ്ട് ഉണ്ടാക്കാൻ സാധിക്കുന്നതല്ല, Mastodon ഉപയോഗിക്കുന്നതിനായി നിങ്ങൾക്ക് {domain}-ൽ പ്രത്യേകമായി ഒരു അക്കൗണ്ട് ആവശ്യമില്ല എന്നത് ദയവായി ഓർക്കുക.",
   "closed_registrations_modal.find_another_server": "മറ്റൊരു സെർവർ കണ്ടെത്തുക",
+  "closed_registrations_modal.title": "മാസ്റ്റഡോണിൽ ചേർക്കൽ",
   "column.about": "അപ്ലിക്കേഷനെക്കുറിച്ച്",
   "column.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "column.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "column.community": "പ്രാദേശികമായ സമയരേഖ",
   "column.directory": "പ്രൊഫൈലുകൾ മറിച്ചുനോക്കുക",
   "column.domain_blocks": "മറയ്ക്കപ്പെട്ട മേഖലകൾ",
+  "column.favourites": "പ്രിയപ്പെട്ടതു്",
   "column.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
-  "column.home": "ഹോം",
+  "column.home": "ആമുഖം",
   "column.lists": "പട്ടികകൾ",
   "column.mutes": "നിശബ്ദമാക്കപ്പെട്ട ഉപയോക്താക്കൾ",
   "column.notifications": "അറിയിപ്പുകൾ",
@@ -89,27 +107,40 @@
   "column_subheading.settings": "ക്രമീകരണങ്ങള്‍",
   "community.column_settings.local_only": "പ്രാദേശികം മാത്രം",
   "community.column_settings.media_only": "മാധ്യമങ്ങൾ മാത്രം",
+  "community.column_settings.remote_only": "വിദൂര മാത്രം",
   "compose.language.change": "ഭാഷ മാറ്റുക",
   "compose.language.search": "ഭാഷകൾ തിരയുക...",
+  "compose.published.open": "തുറക്കുക",
   "compose_form.direct_message_warning_learn_more": "കൂടുതൽ പഠിക്കുക",
   "compose_form.encryption_warning": "Mastodon-ലെ പോസ്റ്റുകൾ എൻഡ്-ടു-എൻഡ് എൻക്രിപ്റ്റ് ചെയ്തവയല്ല. അതിനാൽ Mastodon-ൽ പ്രധാനപ്പെട്ട വിവരങ്ങളൊന്നും പങ്കിടരുത്.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
   "compose_form.lock_disclaimer.lock": "ലോക്കുചെയ്തു",
   "compose_form.placeholder": "നിങ്ങളുടെ മനസ്സിൽ എന്താണ്?",
   "compose_form.poll.duration": "തിരഞ്ഞെടുപ്പിന്റെ സമയദൈർഖ്യം",
+  "compose_form.poll.multiple": "ഒരുപാടു് സാധ്യതകൾ",
+  "compose_form.poll.option_placeholder": "സാധ്യത {number}",
   "compose_form.poll.switch_to_multiple": "വോട്ടെടുപ്പിൽ ഒന്നിലധികം ചോയ്‌സുകൾ ഉൾപ്പെടുതുക",
   "compose_form.poll.switch_to_single": "വോട്ടെടുപ്പിൽ ഒരൊറ്റ ചോയ്‌സ്‌ മാത്രം ആക്കുക",
+  "compose_form.poll.type": "രീതി",
+  "compose_form.publish": "അയക്കുക",
   "compose_form.publish_form": "Publish",
+  "compose_form.reply": "മറുപടി",
+  "compose_form.save_changes": "കാലാനുസ്യതമാക്കുക",
   "compose_form.spoiler.marked": "എഴുത്ത് മുന്നറിയിപ്പിനാൽ മറച്ചിരിക്കുന്നു",
   "compose_form.spoiler.unmarked": "എഴുത്ത് മറയ്ക്കപ്പെട്ടിട്ടില്ല",
   "confirmation_modal.cancel": "റദ്ദാക്കുക",
   "confirmations.block.confirm": "തടയുക",
   "confirmations.delete.confirm": "മായ്ക്കുക",
   "confirmations.delete.message": "ഈ ടൂട്ട് ഇല്ലാതാക്കണം എന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
+  "confirmations.delete.title": "എഴുത്തുൾ മായ്ക്കുക?",
   "confirmations.delete_list.confirm": "മായ്ക്കുക",
   "confirmations.delete_list.message": "ഈ പട്ടിക എന്നെന്നേക്കുമായി നീക്കം ചെയ്യാൻ നിങ്ങൾ ആഗ്രഹിക്കുന്നുണ്ടോ?",
+  "confirmations.delete_list.title": "പട്ടിക കളയുണോ?",
+  "confirmations.discard_edit_media.confirm": "കളയുക",
+  "confirmations.edit.confirm": "സംശോധിക്കുക",
   "confirmations.logout.confirm": "പുറത്തുകടക്കുക",
   "confirmations.logout.message": "നിങ്ങൾക്ക് ലോഗ് ഔട്ട് ചെയ്യണമെന്ന് ഉറപ്പാണോ?",
+  "confirmations.logout.title": "പുറത്തിറങ്ങുക?",
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
   "confirmations.redraft.confirm": "മായിച്ച് മാറ്റങ്ങൾ വരുത്തി വീണ്ടും എഴുതുക",
   "confirmations.reply.confirm": "മറുപടി",
@@ -125,9 +156,12 @@
   "directory.local": "{domain} ൽ നിന്ന് മാത്രം",
   "directory.new_arrivals": "പുതിയ വരവുകൾ",
   "directory.recently_active": "അടുത്തിടെയായി സജീവമായ",
+  "disabled_account_banner.account_settings": "ഇടപാടു് ക്രമീകരങ്ങൾ",
   "disabled_account_banner.text": "നിങ്ങളുടെ {disabledAccount} എന്ന അക്കൗണ്ട് ഇപ്പോൾ പ്രവർത്തനരഹിതമാണ്.",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
+  "domain_block_modal.title": "മേഖല തടസ്സപെടുത്തുക?",
+  "domain_pill.username": "ഉപയോക്തൃപേരു്",
   "embed.instructions": "ചുവടെയുള്ള കോഡ് പകർത്തിക്കൊണ്ട് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ഈ ടൂട്ട് ഉൾച്ചേർക്കുക.",
   "embed.preview": "ഇത് ഇങ്ങനെ കാണപ്പെടും:",
   "emoji_button.activity": "പ്രവര്‍ത്തനം",
@@ -158,10 +192,28 @@
   "empty_column.notifications": "നിങ്ങൾക്ക് ഇതുവരെ ഒരു അറിയിപ്പുകളും ഇല്ല. മറ്റുള്ളവരുമായി ഇടപെട്ട് സംഭാഷണത്തിന് തുടക്കം കുറിക്കു.",
   "empty_column.public": "ഇവിടെ ഒന്നുമില്ലല്ലോ! ഇവിടെ നിറയ്ക്കാൻ എന്തെങ്കിലും പരസ്യമായി എഴുതുകയോ മറ്റ് ഉപഭോക്താക്കളെ പിന്തുടരുകയോ ചെയ്യുക",
   "errors.unexpected_crash.report_issue": "പ്രശ്നം അറിയിക്കുക",
+  "explore.search_results": "തിരയൽ ഫലങ്ങൾ",
+  "explore.suggested_follows": "ആൾക്കാർ",
   "explore.title": "പര്യവേക്ഷണം നടത്തുക",
+  "explore.trending_links": "വാര്‍ത്ത",
+  "explore.trending_statuses": "എഴുത്തുകൾ",
+  "explore.trending_tags": "ചർച്ചാവിഷയങ്ങൾ",
+  "filter_modal.added.review_and_configure_title": "അരിക്കൽ ക്രമീകരങ്ങൾ",
   "filter_modal.select_filter.prompt_new": "പുതിയ വിഭാഗം: {name}",
+  "filter_modal.select_filter.search": "തിരയുക അല്ലെങ്കിൽ നിർമാണിക്കുക",
+  "firehose.all": "എല്ലാം",
   "follow_request.authorize": "ചുമതലപ്പെടുത്തുക",
   "follow_request.reject": "നിരസിക്കുക",
+  "follow_suggestions.dismiss": "വീണ്ടും കാണിക്കരുതു്",
+  "follow_suggestions.view_all": "എല്ലാം കാണുക",
+  "follow_suggestions.who_to_follow": "ആരേ പിന്തുടരണം",
+  "followed_tags": "പിന്തുടരിയതു് ചർച്ചാവിഷയങ്ങൾ",
+  "footer.directory": "രൂപരേഖ നാമഗൃഹസൂചി",
+  "footer.get_app": "ഉപകരണം ലഭിക്കൂ",
+  "footer.invite": "ആളുകളെ ക്ഷണിക്കുക",
+  "footer.privacy_policy": "സ്വകാര്യത്തനയം",
+  "footer.source_code": "ഉറവിടസങ്കേതം കാണുക",
+  "footer.status": "അവസ്ഥ",
   "generic.saved": "സംരക്ഷിച്ചു",
   "getting_started.heading": "തുടക്കം കുറിക്കുക",
   "hashtag.column_header.tag_mode.all": "{additional} ഉം കൂടെ",
@@ -173,11 +225,19 @@
   "hashtag.column_settings.tag_mode.any": "ഇവയിലേതെങ്കിലും",
   "hashtag.column_settings.tag_mode.none": "ഇതിലൊന്നുമല്ല",
   "hashtag.column_settings.tag_toggle": "ഈ എഴുത്തുപംക്തിക്ക് കൂടുതൽ ഉപനാമങ്ങൾ ചേർക്കുക",
+  "hashtag.follow": "ചർച്ചാവിഷയം പിന്തുടരുക",
+  "hashtag.unfollow": "ചർച്ചാവിഷയം പിന്തുടരരുതു്",
   "home.column_settings.show_reblogs": "ബൂസ്റ്റുകൾ കാണിക്കുക",
   "home.column_settings.show_replies": "മറുപടികൾ കാണിക്കുക",
   "home.hide_announcements": "പ്രഖ്യാപനങ്ങൾ മറയ്‌ക്കുക",
+  "home.pending_critical_update.link": "പുതുകൾ കാണുക",
   "home.show_announcements": "പ്രഖ്യാപനങ്ങൾ കാണിക്കുക",
+  "interaction_modal.login.action": "ആമുഖം വരെ എടുത്തോണ്ടു് പോവുക",
+  "interaction_modal.login.prompt": "ആമുഖപ്രദാനിയുടെ മേഖലപേരു്. ഉദ: mastodon.social",
+  "interaction_modal.no_account_yet": "മാസ്റ്റഡോണിൽ ഇല്ലേ?",
   "interaction_modal.on_this_server": "ഈ സെർവറീൽ",
+  "interaction_modal.title.favourite": "പ്രിയപ്പെട്ട {name}-ന്റെ എഴുതു്",
+  "interaction_modal.title.follow": "{name}-െ പിന്തുടരുക",
   "keyboard_shortcuts.back": "തിരികെ പോകുക",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "ബൂസ്റ്റ് ചെയ്യുക",
@@ -189,7 +249,7 @@
   "keyboard_shortcuts.enter": "ടൂട്ട് എടുക്കാൻ",
   "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "കീബോർഡ് എളുപ്പവഴികൾ",
-  "keyboard_shortcuts.home": "ഹോം ടൈംലൈൻ തുറക്കുന്നതിന്",
+  "keyboard_shortcuts.home": "ആമുഖം സമയരേഖ തുറക്കുക",
   "keyboard_shortcuts.legend": "to display this legend",
   "keyboard_shortcuts.local": "പ്രാദേശിക സമയരേഖ തുറക്കാൻ",
   "keyboard_shortcuts.mention": "രചയിതാവിനെ സൂചിപ്പിക്കാൻ",
@@ -212,45 +272,62 @@
   "lightbox.close": "അടയ്ക്കുക",
   "lightbox.next": "അടുത്തത്",
   "lightbox.previous": "പുറകോട്ട്",
+  "limited_account_hint.action": "എന്നാലും രൂപരേഖ കാണിക്കുക",
+  "link_preview.author": "{name}-നിന്നു്",
   "lists.account.add": "പട്ടികയിലേക്ക് ചേർക്കുക",
   "lists.account.remove": "പട്ടികയിൽ നിന്ന് ഒഴിവാക്കുക",
   "lists.delete": "പട്ടിക ഒഴിവാക്കുക",
   "lists.edit": "പട്ടിക തിരുത്തുക",
   "lists.edit.submit": "തലക്കെട്ട് മാറ്റുക",
+  "lists.exclusive": "ഈ എഴുത്തുകൾ ആമുഖം നിന്നു് മറയ്ക്കുക",
   "lists.new.create": "പുതിയ പട്ടിക ചേർക്കുക",
+  "lists.new.title_placeholder": "പുതിയ പട്ടിക തലക്കെട്ടു്",
   "lists.replies_policy.none": "ആരുമില്ല",
   "lists.replies_policy.title": "ഇതിനുള്ള മറുപടികൾ കാണിക്കുക:",
   "lists.subheading": "എന്റെ പട്ടികകൾ",
+  "media_gallery.hide": "മറയ്ക്കുക",
   "navigation_bar.blocks": "തടയപ്പെട്ട ഉപയോക്താക്കൾ",
   "navigation_bar.bookmarks": "ബുക്ക്മാർക്കുകൾ",
   "navigation_bar.community_timeline": "പ്രാദേശിക സമയരേഖ",
   "navigation_bar.compose": "പുതിയ ടൂട്ട് എഴുതുക",
   "navigation_bar.discover": "കണ്ടെത്തുക",
   "navigation_bar.domain_blocks": "Hidden domains",
+  "navigation_bar.explore": "ആരായുക",
+  "navigation_bar.favourites": "പ്രിയപ്പെട്ടതു്",
   "navigation_bar.follow_requests": "പിന്തുടരാനുള്ള അഭ്യർത്ഥനകൾ",
   "navigation_bar.lists": "ലിസ്റ്റുകൾ",
   "navigation_bar.logout": "ലോഗൗട്ട്",
   "navigation_bar.mutes": "നിശബ്ദമാക്കപ്പെട്ട ഉപയോക്താക്കൾ",
+  "navigation_bar.personal": "സ്വകാര്യ",
   "navigation_bar.pins": "Pinned toots",
   "navigation_bar.preferences": "ക്രമീകരണങ്ങൾ",
+  "navigation_bar.search": "തിരയുക",
   "navigation_bar.security": "സുരക്ഷ",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.follow": "{name} നിങ്ങളെ പിന്തുടർന്നു",
   "notification.follow_request": "{name} നിങ്ങളെ പിന്തുടരാൻ അഭ്യർത്ഥിച്ചു",
+  "notification.label.reply": "മറുപടി",
+  "notification.moderation-warning.learn_more": "ഇനീം അറിയുക",
+  "notification.moderation_warning.action_silence": "താങ്ങളുടെ ഇടപാടു് പരിധിപെട്ടിരിക്കുന്നു.",
   "notification.own_poll": "നിങ്ങളുടെ പോൾ അവസാനിച്ചു",
   "notification.reblog": "{name} നിങ്ങളുടെ പോസ്റ്റ് ബൂസ്റ്റ് ചെയ്തു",
   "notification.status": "{name} ഇപ്പോൾ പോസ്റ്റുചെയ്‌തു",
+  "notification_requests.accept": "സ്വീകരിക്കുക",
+  "notification_requests.edit_selection": "പരിഷ്കരിക്കുക",
   "notifications.clear": "അറിയിപ്പ് മായ്ക്കുക",
   "notifications.clear_confirmation": "നിങ്ങളുടെ എല്ലാ അറിയിപ്പുകളും ശാശ്വതമായി മായ്‌ക്കണമെന്ന് നിങ്ങൾക്ക് ഉറപ്പാണോ?",
   "notifications.column_settings.alert": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ",
   "notifications.column_settings.follow": "പുതിയ പിന്തുടരുന്നവർ:",
   "notifications.column_settings.follow_request": "പുതിയ പിന്തുടരൽ അഭ്യർത്ഥനകൾ:",
+  "notifications.column_settings.group": "കൂട്ടം",
   "notifications.column_settings.mention": "സൂചനകൾ:",
   "notifications.column_settings.poll": "പോൾ ഫലങ്ങൾ:",
   "notifications.column_settings.push": "പുഷ് അറിയിപ്പുകൾ",
   "notifications.column_settings.reblog": "ബൂസ്റ്റുകൾ:",
+  "notifications.column_settings.show": "എഴുത്തുപംക്തിയിൽ കാണിക്കുക",
   "notifications.column_settings.sound": "ശബ്ദം പ്ലേ ചെയ്യുക",
   "notifications.column_settings.status": "പുതിയ ടൂട്ടുകൾ:",
+  "notifications.column_settings.update": "പരിഷ്കരണങ്ങൾ:",
   "notifications.filter.all": "എല്ലാം",
   "notifications.filter.boosts": "ബൂസ്റ്റുകൾ",
   "notifications.filter.follows": "പിന്തുടരുന്നു",
@@ -260,15 +337,19 @@
   "notifications.grant_permission": "അനുമതി നൽകുക.",
   "notifications.group": "{count} അറിയിപ്പുകൾ",
   "notifications.mark_as_read": "എല്ലാ അറിയിപ്പുകളും വായിച്ചതായി അടയാളപ്പെടുത്തുക",
+  "notifications.policy.filter": "അരിക്കൽ",
+  "notifications.policy.filter_new_accounts_title": "പുതിയ ഇടപാടുകൾ",
+  "notifications.policy.filter_not_followers_title": "താങ്ങളെ പിന്തുടരാത്തതു് ആൾക്കാർ",
   "notifications_permission_banner.enable": "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകൾ പ്രാപ്തമാക്കുക",
   "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Go to your home feed",
+  "onboarding.actions.go_to_home": "ആമുഖത്താൾ വരെ പോവ്വുക",
-  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+  "onboarding.follows.lead": "",
-  "onboarding.follows.title": "Popular on Mastodon",
+  "onboarding.follows.title": "താങ്ങളുടെ ആമുഖത്താളിന് വ്യക്തിപരമാക്കുക",
+  "onboarding.share.title": "താങ്ങളുടെ രൂപരേഖ പങ്കിടുക",
   "onboarding.start.lead": "Your new Mastodon account is ready to go. Here's how you can make the most of it:",
   "onboarding.start.skip": "Want to skip right ahead?",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
+  "onboarding.steps.follow_people.title": "താങ്ങളുടെ ആമുഖത്താളിന് വ്യക്തിപരമാക്കുക",
   "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
@@ -277,22 +358,32 @@
   "picture_in_picture.restore": "തിരികെ വയ്ക്കുക",
   "poll.closed": "അടച്ചു",
   "poll.refresh": "പുതുക്കുക",
+  "poll.reveal": "ഫലങ്ങൾ കാണുക",
   "poll.vote": "വോട്ട് ചെയ്യുക",
   "poll.voted": "ഈ ഉത്തരത്തിനായി നിങ്ങൾ വോട്ട് ചെയ്തു",
   "poll_button.add_poll": "ഒരു പോൾ ചേർക്കുക",
   "poll_button.remove_poll": "പോൾ നീക്കംചെയ്യുക",
   "privacy.change": "ടൂട്ട് സ്വകാര്യത ക്രമീകരിക്കുക",
+  "privacy.private.long": "താങ്ങളെ പിന്തുടരുന്നവർ മാത്രം",
+  "privacy.private.short": "പിന്തുടരുന്നവർ",
   "privacy.public.short": "എല്ലാവര്‍ക്കും",
+  "privacy_policy.title": "സ്വകാര്യത്തനയം",
   "refresh": "പുതുക്കുക",
   "regeneration_indicator.label": "ലഭ്യമാക്കുന്നു…",
-  "regeneration_indicator.sublabel": "നിങ്ങളുടെ ഹോം ഫീഡ് തയാറാക്കുന്നു!",
+  "regeneration_indicator.sublabel": "നിങ്ങളുടെ താങ്ങളുടെ ആമുഖത്താളിന് തയാറാക്കുന്നു!",
   "relative_time.days": "{number}ദിവസം",
+  "relative_time.full.just_now": "ഇപ്പോൾതന്നെ",
   "relative_time.hours": "{number}മണി",
   "relative_time.just_now": "ഇപ്പോൾ",
   "relative_time.today": "ഇന്ന്",
   "reply_indicator.cancel": "റദ്ദാക്കുക",
+  "report.block": "തടസ്സപെടുത്തുക",
+  "report.category.title_account": "രൂപരേഖ",
+  "report.close": "ചെയ്തു",
   "report.forward_hint": "ഈ അക്കൗണ്ട് മറ്റൊരു സെർവറിൽ നിന്നാണ്. റിപ്പോർട്ടിന്റെ അജ്ഞാത പകർപ്പ് അവിടെ അയയ്ക്കണോ?",
+  "report.next": "അടുത്തതു്",
   "report.placeholder": "കൂടുതൽ അഭിപ്രായങ്ങൾ",
+  "report.reasons.spam": "ഇതു് പാഴടക്കമാണു്",
   "report.submit": "സമർപ്പിക്കുക",
   "report.target": "Report {target}",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
@@ -327,7 +418,7 @@
   "status.share": "പങ്കിടുക",
   "status.show_more_all": "എല്ലാവർക്കുമായി കൂടുതൽ കാണിക്കുക",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "tabs_bar.home": "ഹോം",
+  "tabs_bar.home": "ആമുഖം",
   "tabs_bar.notifications": "അറിയിപ്പുകൾ",
   "time_remaining.days": "{number, plural, one {# ദിവസം} other {# ദിവസങ്ങൾ}} ബാക്കി",
   "time_remaining.hours": "{number, plural, one {# മണിക്കൂർ} other {# മണിക്കൂർ}} ശേഷിക്കുന്നു",
@@ -351,7 +442,7 @@
   "upload_modal.preview_label": "പൂര്‍വ്വദൃശ്യം({ratio})",
   "upload_progress.label": "Uploading…",
   "video.close": "വീഡിയോ അടയ്ക്കുക",
-  "video.download": "ഫയൽ ഡൌൺലോഡ് ചെയ്യുക",
+  "video.download": "ഫയൽ ഇറക്കുവയ്ക്കുക",
   "video.exit_fullscreen": "പൂർണ്ണ സ്ക്രീനിൽ നിന്ന് പുറത്തുകടക്കുക",
   "video.expand": "വീഡിയോ വികസപ്പിക്കൂ",
   "video.fullscreen": "പൂർണ്ണ സ്ക്രീൻ",

app/javascript/mastodon/locales/ms.json

@@ -36,6 +36,7 @@
   "account.followers.empty": "Belum ada yang mengikuti pengguna ini.",
   "account.followers_counter": "{count, plural, one {{counter} Diikuti} other {{counter} Diikuti}}",
   "account.following": "Mengikuti",
+  "account.following_counter": "{count, plural, other {{counter} following}}",
   "account.follows.empty": "Pengguna ini belum mengikuti sesiapa.",
   "account.go_to_profile": "Pergi ke profil",
   "account.hide_reblogs": "Sembunyikan galakan daripada @{name}",
@@ -61,6 +62,7 @@
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
+  "account.statuses_counter": "{count, plural, other {{counter} siaran}}",
   "account.unblock": "Nyahsekat @{name}",
   "account.unblock_domain": "Nyahsekat domain {domain}",
   "account.unblock_short": "Nyahsekat",

app/javascript/mastodon/locales/nl.json

@@ -459,7 +459,7 @@
   "lists.subheading": "Jouw lijsten",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
   "loading_indicator.label": "Laden…",
-  "media_gallery.hide": "Verbergen",
+  "media_gallery.hide": "Verberg",
   "moved_to_account_banner.text": "Omdat je naar {movedToAccount} bent verhuisd is jouw account {disabledAccount} momenteel uitgeschakeld.",
   "mute_modal.hide_from_notifications": "Onder meldingen verbergen",
   "mute_modal.hide_options": "Opties verbergen",
@@ -504,22 +504,23 @@
   "notification.admin.report_statuses": "{name} rapporteerde {target} voor {category}",
   "notification.admin.report_statuses_other": "{name} rapporteerde {target}",
   "notification.admin.sign_up": "{name} heeft zich geregistreerd",
-  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben zich geregistreerd",
+  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben zich geregistreerd",
   "notification.favourite": "{name} markeerde jouw bericht als favoriet",
-  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht als favoriet gemarkeerd",
+  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht als favoriet gemarkeerd",
   "notification.follow": "{name} volgt jou nu",
-  "notification.follow.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben je gevolgd",
+  "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> volgen jou nou",
   "notification.follow_request": "{name} wil jou graag volgen",
-  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben gevraagd om je te volgen",
+  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben gevraagd om je te volgen",
   "notification.label.mention": "Vermelding",
   "notification.label.private_mention": "Privébericht",
   "notification.label.private_reply": "Privéreactie",
   "notification.label.reply": "Reactie",
   "notification.mention": "Vermelding",
+  "notification.mentioned_you": "Je bent vermeld door {name}",
   "notification.moderation-warning.learn_more": "Meer informatie",
   "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
   "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
-  "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+  "notification.moderation_warning.action_disable": "Jouw account is uitgeschakeld.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
   "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
   "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
@@ -528,14 +529,14 @@
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
   "notification.reblog": "{name} boostte jouw bericht",
-  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht geboost",
+  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht geboost",
   "notification.relationships_severance_event": "Verloren verbindingen met {name}",
   "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
-  "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt.",
+  "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die je volgt.",
   "notification.relationships_severance_event.learn_more": "Meer informatie",
-  "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt, bent verloren.",
+  "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die je volgt, bent verloren.",
   "notification.status": "{name} heeft zojuist een bericht geplaatst",
-  "notification.update": "{name} heeft een bericht bewerkt",
+  "notification.update": "{name} bewerkte een bericht",
   "notification_requests.accept": "Accepteren",
   "notification_requests.accept_multiple": "{count, plural, one {# verzoek accepteren…} other {# verzoeken accepteren…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Verzoek accepteren} other {Verzoeken accepteren}}",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Snelle filterbalk",
   "notifications.column_settings.follow": "Nieuwe volgers:",
   "notifications.column_settings.follow_request": "Nieuw volgverzoek:",
+  "notifications.column_settings.group": "Groeperen",
   "notifications.column_settings.mention": "Vermeldingen:",
   "notifications.column_settings.poll": "Peilingresultaten:",
   "notifications.column_settings.push": "Pushmeldingen",
@@ -780,7 +782,7 @@
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
-  "status.continued_thread": "Vervolgt het gesprek",
+  "status.continued_thread": "Vervolg van gesprek",
   "status.copy": "Link naar bericht kopiëren",
   "status.delete": "Verwijderen",
   "status.detailed_status": "Uitgebreide gespreksweergave",

app/javascript/mastodon/locales/nn.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} markerte innlegget ditt som favoritt",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> favorittmerka innlegget ditt",
   "notification.follow": "{name} fylgde deg",
-  "notification.follow.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} fylgde deg",
+  "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
   "notification.follow_request.name_and_others": "{name} og {count, plural, one {# annan} other {# andre}} har spurt om å fylgja deg",
   "notification.label.mention": "Omtale",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Privat svar",
   "notification.label.reply": "Svar",
   "notification.mention": "Omtale",
+  "notification.mentioned_you": "{name} nemnde deg",
   "notification.moderation-warning.learn_more": "Lær meir",
   "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
   "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Snøggfilterline",
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
+  "notifications.column_settings.group": "Gruppe",
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Røysteresultat:",
   "notifications.column_settings.push": "Pushvarsel",

app/javascript/mastodon/locales/no.json

@@ -502,6 +502,8 @@
   "notification.reblog": "{name} fremhevet ditt innlegg",
   "notification.status": "{name} la nettopp ut",
   "notification.update": "{name} redigerte et innlegg",
+  "notification_requests.minimize_banner": "Minimer banneret for filtrerte varsler",
+  "notification_requests.view": "Vis varsler",
   "notifications.clear": "Fjern varsler",
   "notifications.clear_confirmation": "Er du sikker på at du vil fjerne alle dine varsler permanent?",
   "notifications.column_settings.admin.report": "Nye rapporter:",

app/javascript/mastodon/locales/oc.json

@@ -8,6 +8,7 @@
   "about.not_available": "Aquesta informacion foguèt pas renduda disponibla sus aqueste servidor.",
   "about.powered_by": "Malhum social descentralizat propulsat per {mastodon}",
   "about.rules": "Règlas del servidor",
+  "account.account_note_header": "Nòta personala",
   "account.add_or_remove_from_list": "Ajustar o tirar de las listas",
   "account.badges.bot": "Robòt",
   "account.badges.group": "Grop",
@@ -72,9 +73,12 @@
   "alert.rate_limited.title": "Taus limitat",
   "alert.unexpected.message": "Una error s’es producha.",
   "alert.unexpected.title": "Ops !",
+  "alt_text_badge.title": "Tèxt alternatiu",
   "announcement.announcement": "Anóncia",
   "attachments_list.unprocessed": "(pas tractat)",
   "audio.hide": "Amagar àudio",
+  "block_modal.show_less": "Ne veire mens",
+  "block_modal.show_more": "Ne veire mai",
   "boost_modal.combo": "Podètz botar {combo} per passar aquò lo còp que ven",
   "bundle_column_error.copy_stacktrace": "Copiar senhalament d’avaria",
   "bundle_column_error.error.title": "Oh non !",
@@ -128,9 +132,14 @@
   "compose_form.poll.duration": "Durada del sondatge",
   "compose_form.poll.switch_to_multiple": "Cambiar lo sondatge per permetre de causidas multiplas",
   "compose_form.poll.switch_to_single": "Cambiar lo sondatge per permetre una sola causida",
+  "compose_form.poll.type": "Estil",
+  "compose_form.publish": "Publicar",
   "compose_form.publish_form": "Publicar",
+  "compose_form.reply": "Respondre",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Lo tèxte es rescondut jos l’avertiment",
   "compose_form.spoiler.unmarked": "Lo tèxte es pas rescondut",
+  "compose_form.spoiler_placeholder": "Avertiment de contengut (opcional)",
   "confirmation_modal.cancel": "Anullar",
   "confirmations.block.confirm": "Blocar",
   "confirmations.delete.confirm": "Escafar",

app/javascript/mastodon/locales/pl.json

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
   "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> polubiła twój wpis} few {# inne osoby</a> polubiły twój wpis} other {# innych osób</a> polubiło twój wpis}}",
   "notification.follow": "{name} obserwuje Cię",
-  "notification.follow.name_and_others": "{name} i {count, plural, one {# inna osoba cię zaobserwowała} few {# inne osoby cię zaobserwowały} other {# innych osób cię zaobserwowało}}",
+  "notification.follow.name_and_others": "{name} i {count, plural, one {<a># inna osoba</a> cię zaobserwowała} few {<a># inne osoby</a> cię zaobserwowały} other {<a># innych osób</a> cię zaobserwowało}}",
   "notification.follow_request": "{name} chce cię zaobserwować",
   "notification.follow_request.name_and_others": "{name} i {count, plural, one {# inna osoba chce} few {# inne osoby chcą} other {# innych osób chce}} zaobserwować twój profil",
   "notification.label.mention": "Wzmianka",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Odpowiedź prywatna",
   "notification.label.reply": "Odpowiedź",
   "notification.mention": "Wzmianka",
+  "notification.mentioned_you": "{name} wspomniał(a) o Tobie",
   "notification.moderation-warning.learn_more": "Dowiedz się więcej",
   "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
   "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Szybkie filtrowanie",
   "notifications.column_settings.follow": "Nowi obserwujący:",
   "notifications.column_settings.follow_request": "Nowe prośby o możliwość obserwacji:",
+  "notifications.column_settings.group": "Grupuj",
   "notifications.column_settings.mention": "Wspomnienia:",
   "notifications.column_settings.poll": "Wyniki głosowania:",
   "notifications.column_settings.push": "Powiadomienia push",

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

@@ -437,6 +437,7 @@
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
   "lightbox.zoom_in": "Voltar para o tamanho real",
+  "lightbox.zoom_out": "Zoom para ajustar",
   "limited_account_hint.action": "Exibir perfil mesmo assim",
   "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores do {domain}.",
   "link_preview.author": "Por {name}",
@@ -507,7 +508,7 @@
   "notification.favourite": "{name} favoritou sua publicação",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# others}}</a> favoritaram a publicação",
   "notification.follow": "{name} te seguiu",
-  "notification.follow.name_and_others": "{name} e {count, plural, one {# other} other {# outros}} seguiu você",
+  "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> seguiram você",
   "notification.follow_request": "{name} quer te seguir",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# other} other {# outros}} pediu para seguir você",
   "notification.label.mention": "Menção",
@@ -515,6 +516,7 @@
   "notification.label.private_reply": "Resposta privada",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menção",
+  "notification.mentioned_you": "{name} te mencionou",
   "notification.moderation-warning.learn_more": "Aprender mais",
   "notification.moderation_warning": "Você recebeu um aviso de moderação",
   "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
@@ -565,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtro rápido",
   "notifications.column_settings.follow": "Seguidores:",
   "notifications.column_settings.follow_request": "Seguidores pendentes:",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Notificações push",
@@ -813,7 +816,7 @@
   "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
   "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover do Salvos",
-  "status.replied_in_thread": "Respondido na discussão",
+  "status.replied_in_thread": "Respondido na conversa",
   "status.replied_to": "Em resposta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder a conversa",
@@ -851,6 +854,11 @@
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
   "upload_form.audio_description": "Descrever para deficientes auditivos",
   "upload_form.description": "Descrever para deficientes visuais",
+  "upload_form.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
+  "upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",
+  "upload_form.drag_and_drop.on_drag_over": "O anexo de mídia {item} foi movido.",
+  "upload_form.drag_and_drop.on_drag_start": "Foi coletado o anexo de mídia {item}.",
   "upload_form.edit": "Editar",
   "upload_form.thumbnail": "Alterar miniatura",
   "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",

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

@@ -503,7 +503,6 @@
   "notification.favourite": "{name} assinalou a sua publicação como favorita",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> assinalou a sua publicação como favorita",
   "notification.follow": "{name} começou a seguir-te",
-  "notification.follow.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} começaram a segui-lo",
   "notification.follow_request": "{name} pediu para segui-lo",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# outro} other {# outros}} pediram para segui-lo",
   "notification.label.mention": "Menção",

app/javascript/mastodon/locales/ru.json

@@ -34,7 +34,7 @@
   "account.follow_back": "Подписаться в ответ",
   "account.followers": "Подписчики",
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
-  "account.followers_counter": "{count, plural, one {{counter} последователя} other {{counter} последователей}}",
+  "account.followers_counter": "{count, plural, one {{counter} подписчик} few {{counter} подписчика} other {{counter} подписчиков}}",
   "account.following": "Подписки",
   "account.following_counter": "{count, plural, one {{counter} последующий} other {{counter} последующие}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
@@ -62,6 +62,7 @@
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
+  "account.statuses_counter": "{count, plural, one {# пост} few {# поста} many {# постов} other {# постов}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unblock_short": "Разблокировать",
@@ -77,13 +78,14 @@
   "admin.dashboard.retention.cohort": "Месяц регистрации",
   "admin.dashboard.retention.cohort_size": "Новые пользователи",
   "admin.impact_report.instance_accounts": "Профили учетных записей, которые будут удалены",
-  "admin.impact_report.instance_followers": "Последователи, которых потеряют наши пользователи",
+  "admin.impact_report.instance_followers": "Подписчики, которых потеряют наши пользователи",
-  "admin.impact_report.instance_follows": "Последователи, которых потеряют наши пользователи",
+  "admin.impact_report.instance_follows": "Подписчики, которых потеряют их пользователи",
   "admin.impact_report.title": "Резюме воздействия",
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ограничение количества запросов",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
   "alert.unexpected.title": "Упс!",
+  "alt_text_badge.title": "Альтернативный текст",
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
@@ -220,6 +222,7 @@
   "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
   "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
   "domain_block_modal.title": "Заблокировать домен?",
+  "domain_block_modal.you_will_lose_relationships": "Вы потеряете всех подписчиков и людей, на которых вы подписаны, на этом сервере.",
   "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
   "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
   "domain_pill.activitypub_like_language": "ActivityPub как язык Mastodon говорит с другими социальными сетями.",
@@ -351,7 +354,7 @@
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
   "hashtags.and_other": "...и {count, plural, other {# ещё}}",
-  "hints.profiles.followers_may_be_missing": "Последователи для этого профиля могут отсутствовать.",
+  "hints.profiles.followers_may_be_missing": "Подписчики у этого профиля могут отсутствовать.",
   "hints.profiles.follows_may_be_missing": "Фолловеры для этого профиля могут отсутствовать.",
   "hints.profiles.posts_may_be_missing": "Некоторые сообщения из этого профиля могут отсутствовать.",
   "hints.profiles.see_more_followers": "Посмотреть больше подписчиков на {domain}",
@@ -432,6 +435,8 @@
   "lightbox.close": "Закрыть",
   "lightbox.next": "Далее",
   "lightbox.previous": "Назад",
+  "lightbox.zoom_in": "Масштаб до фактического размера",
+  "lightbox.zoom_out": "Масштаб по размеру экрана",
   "limited_account_hint.action": "Все равно показать профиль",
   "limited_account_hint.title": "Этот профиль был скрыт модераторами {domain}.",
   "link_preview.author": "Автор: {name}",
@@ -503,12 +508,13 @@
   "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# другие} other {# другие}}</a> отдали предпочтение вашему посту",
   "notification.follow": "{name} подписался (-лась) на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
-  "notification.follow_request.name_and_others": "{name} и {count, plural, one {# другие} other {# другие}} последовали за тобой",
+  "notification.follow_request.name_and_others": "{name} и ещё {count, plural, one {#} other {# других}} подписались на вас",
   "notification.label.mention": "Упоминание",
   "notification.label.private_mention": "Частное упоминание",
   "notification.label.private_reply": "Частный ответ",
   "notification.label.reply": "Ответить",
   "notification.mention": "Упоминание",
+  "notification.mentioned_you": "{name} упомянул(а) вас",
   "notification.moderation-warning.learn_more": "Узнать больше",
   "notification.moderation_warning": "Вы получили предупреждение от модерации",
   "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
@@ -632,7 +638,7 @@
   "onboarding.steps.share_profile.title": "Поделитесь вашим профилем",
   "onboarding.tips.2fa": "<strong>Знаете ли вы? </strong> Вы можете защитить свой аккаунт, настроив двухфакторную аутентификацию в настройках аккаунта. Она работает с любым приложением TOTP по вашему выбору, номер телефона не требуется!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Знали ли вы? </strong> Поскольку Mastodon децентрализован, некоторые профили, с которыми вы столкнетесь, будут размещены на серверах, отличных от вашего. И все же вы можете взаимодействовать с ними без проблем! Их сервер находится во второй половине имени пользователя!",
-  "onboarding.tips.migration": "<strong>Знаете ли вы? </strong> Если вы чувствуете, что {domain} не подходит вам в качестве сервера в будущем, вы можете переехать на другой сервер Mastodon без потери своих последователей. Вы даже можете разместить свой собственный сервер!",
+  "onboarding.tips.migration": "<strong>Знаете ли вы? </strong> Если вы чувствуете, что {domain} не подходит вам в качестве сервера в будущем, вы можете переехать на другой сервер Mastodon без потери своих подписчиков. Вы даже можете разместить свой собственный сервер!",
   "onboarding.tips.verification": "<strong>Знали ли вы? </strong> Вы можете подтвердить свою учетную запись, разместив ссылку на свой профиль Mastodon на собственном сайте и добавив сайт в свой профиль. Никаких сборов или документов не требуется!",
   "password_confirmation.exceeds_maxlength": "Срок подтверждения пароля превышает максимальную длину пароля",
   "password_confirmation.mismatching": "Введенные пароли не совпадают.",
@@ -725,6 +731,7 @@
   "report_notification.categories.spam": "Спам",
   "report_notification.categories.spam_sentence": "спам",
   "report_notification.categories.violation": "Нарушение правил",
+  "report_notification.categories.violation_sentence": "нарушение правила",
   "report_notification.open": "Открыть жалобу",
   "search.no_recent_searches": "Недавние запросы отсутствуют",
   "search.placeholder": "Поиск",
@@ -754,7 +761,7 @@
   "server_banner.administered_by": "Управляется:",
   "server_banner.is_one_of_many": "{domain} - это один из многих независимых серверов Mastodon, которые вы можете использовать для участия в fediverse.",
   "server_banner.server_stats": "Статистика сервера:",
-  "sign_in_banner.create_account": "Создать учётную запись",
+  "sign_in_banner.create_account": "Зарегистрироваться",
   "sign_in_banner.follow_anyone": "Следите за любым человеком в федеральной вселенной и смотрите все в хронологическом порядке. Никаких алгоритмов, рекламы или клик бейта.",
   "sign_in_banner.mastodon_is": "Mastodon - лучший способ быть в курсе всего происходящего.",
   "sign_in_banner.sign_in": "Войти",
@@ -836,6 +843,10 @@
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
   "upload_form.audio_description": "Опишите аудиофайл для людей с нарушением слуха",
   "upload_form.description": "Добавьте описание для людей с нарушениями зрения:",
+  "upload_form.drag_and_drop.instructions": "Чтобы подобрать прикрепленный файл, нажмите \"Пробел\" (Space) или \"Ввод\" (Enter). При перетаскивании используйте клавиши со стрелками, чтобы переместить прикрепленные файлы в любом направлении. Нажмите \"Пробел\" (Space) или \"Ввод\" (Enter) еще раз, чтобы переместить вложение в новое место, или нажмите кнопку \"Выйти\" (Escape), чтобы отменить.",
+  "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.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",

app/javascript/mastodon/locales/sc.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Màssimu de rechestas barigadu",
   "alert.unexpected.message": "Ddoe est istada una faddina.",
   "alert.unexpected.title": "Oh!",
+  "alt_text_badge.title": "Testu alternativu",
   "announcement.announcement": "Annùntziu",
   "attachments_list.unprocessed": "(non protzessadu)",
   "audio.hide": "Cua s'àudio",
@@ -97,6 +98,8 @@
   "block_modal.title": "Boles blocare s'utente?",
   "block_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent custa persone.",
   "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
+  "boost_modal.reblog": "Boles potentziare sa publicatzione?",
+  "boost_modal.undo_reblog": "Boles tzessare de potentziare sa publicatzione?",
   "bundle_column_error.copy_stacktrace": "Còpia s'informe de faddina",
   "bundle_column_error.error.body": "Sa pàgina pedida non faghiat a dda renderizare. Diat pòdere èssere pro neghe de una faddina in su còdighe nostru, o de unu problema de cumpatibilidade de su navigadore.",
   "bundle_column_error.error.title": "Oh, no!",
@@ -104,11 +107,15 @@
   "bundle_column_error.network.title": "Faddina de connessione",
   "bundle_column_error.retry": "Torra·bi a proare",
   "bundle_column_error.return": "Torra a sa pàgina printzipale",
+  "bundle_column_error.routing.body": "Impossìbile agatare sa pàgina rechesta. Seguru chi s'URL in sa barra de indiritzos est curretu?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Serra",
   "bundle_modal_error.message": "Faddina in su carrigamentu de custu cumponente.",
   "bundle_modal_error.retry": "Torra·bi a proare",
+  "closed_registrations.other_server_instructions": "Dae chi Mastodon est detzentralizadu, podes creare unu contu in un'àteru serbidore e interagire cun custu.",
+  "closed_registrations_modal.description": "Sa creatzione de contos in {domain} no est possìbile in custu momentu, però tene in cunsideru chi non tenes bisòngiu de unu contu ispetzìficu in {domain} pro impreare Mastodon.",
   "closed_registrations_modal.find_another_server": "Agata un'àteru serbidore",
+  "closed_registrations_modal.title": "Su registru a Mastodon",
   "column.about": "Informatziones",
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
@@ -142,6 +149,7 @@
   "compose.published.open": "Aberi",
   "compose.saved.body": "Publicatzione sarvada.",
   "compose_form.direct_message_warning_learn_more": "Àteras informatziones",
+  "compose_form.encryption_warning": "Is publicatziones a Mastodon no sunt critografados a nodu terminale. Non cumpartzas informatziones delicadas in Mastodon.",
   "compose_form.hashtag_warning": "Custa publicatzione no at a èssere ammustrada in peruna eticheta, dae chi no est pùblica. Isceti is publicatziones pùblicas podent èssere chircadas cun etichetas.",
   "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
   "compose_form.lock_disclaimer.lock": "blocadu",
@@ -171,15 +179,23 @@
   "confirmations.discard_edit_media.confirm": "Iscarta",
   "confirmations.discard_edit_media.message": "Tenes modìficas non sarvadas a is descritziones o a is anteprimas de is cuntenutos, ddas boles iscartare su matessi?",
   "confirmations.edit.confirm": "Modìfica",
+  "confirmations.edit.message": "Modifichende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
+  "confirmations.edit.title": "Boles subraiscrìere sa publicatzione?",
   "confirmations.logout.confirm": "Essi·nche",
   "confirmations.logout.message": "Seguru chi boles essire?",
+  "confirmations.logout.title": "Boles serrare sa sessione?",
   "confirmations.mute.confirm": "A sa muda",
   "confirmations.redraft.confirm": "Cantzella e torra a fàghere",
   "confirmations.redraft.message": "Seguru chi boles cantzellare e torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.",
+  "confirmations.redraft.title": "Boles cantzellare e torrare a iscrìere sa publicatzione?",
   "confirmations.reply.confirm": "Risponde",
   "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
+  "confirmations.reply.title": "Boles subraiscrìere sa publicatzione?",
   "confirmations.unfollow.confirm": "Non sigas prus",
   "confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
+  "confirmations.unfollow.title": "Boles tzessare de sighire s'utente?",
+  "content_warning.hide": "Cua sa publicatzione",
+  "content_warning.show": "Ammustra·dda su pròpiu",
   "conversation.delete": "Cantzella arresonada",
   "conversation.mark_as_read": "Signala comente lèghidu",
   "conversation.open": "Ammustra arresonada",
@@ -193,7 +209,10 @@
   "directory.recently_active": "Cun atividade dae pagu",
   "disabled_account_banner.account_settings": "Cunfiguratziones de su contu",
   "disabled_account_banner.text": "Su contu tuo {disabledAccount} no est ativu.",
+  "dismissable_banner.community_timeline": "Custas sunt is publicatziones pùblicas prus reghentes dae gente cun contu in {domain}.",
   "dismissable_banner.dismiss": "Iscarta",
+  "dismissable_banner.explore_links": "Custas sunt is istòrias de noas prus cumpartzidas in sa rete oe. Is istòrias prus noas publicadas dae gente prus diversa ant a èssere priorizadas.",
+  "dismissable_banner.explore_statuses": "Custas sunt publicatziones dae sa rete detzentralizada chi sunt retzende atentzione oe. Is publicatziones prus noas cun prus cumpartziduras e preferèntzias ant a èssere priorizadas.",
   "domain_block_modal.block": "Bloca su serbidore",
   "domain_block_modal.block_account_instead": "Bloca imbetzes a @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Is persones de custu serbidore podent ancora interagire cun is publicatziones betzas tuas.",
@@ -207,6 +226,7 @@
   "domain_pill.their_handle": "S'identificadore suo:",
   "domain_pill.their_server": "Sa domo digitale sua, in ue istant totu is publicatziones suas.",
   "domain_pill.username": "Nòmine de utente",
+  "domain_pill.whats_in_a_handle": "Ite est un'identificadore?",
   "domain_pill.your_handle": "S'identificadore tuo:",
   "domain_pill.your_server": "Sa domo digitale tua, in ue istant totu is publicatziones tuas. Custa non t'agradat? Tràmuda serbidore in cale si siat momentu e bati·ti fintzas in fatu is sighidores tuos.",
   "domain_pill.your_username": "S'identificadore ùnicu tuo in custu serbidore. Si podent agatare utentes cun su matessi nòmine de utente in àteros serbidores.",
@@ -254,6 +274,7 @@
   "explore.trending_links": "Noas",
   "explore.trending_statuses": "Publicatziones",
   "explore.trending_tags": "Etichetas",
+  "filter_modal.added.context_mismatch_title": "Su cuntestu non currispondet.",
   "filter_modal.added.expired_title": "Filtru iscadidu.",
   "filter_modal.added.review_and_configure_title": "Cunfiguratziones de filtru",
   "filter_modal.added.settings_link": "pàgina de cunfiguratzione",
@@ -277,7 +298,13 @@
   "follow_suggestions.featured_longer": "Seberadu a manu dae s'iscuadra de {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populare intre persones chi sighis",
   "follow_suggestions.hints.featured": "Custu profilu est istadu seberadu a manu dae s'iscuadra {domain}.",
+  "follow_suggestions.personalized_suggestion": "Cussìgiu personalizadu",
+  "follow_suggestions.popular_suggestion": "Cussìgiu populare",
+  "follow_suggestions.popular_suggestion_longer": "Populare a {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Profilos sìmiles a is chi as sighidu de reghente",
   "follow_suggestions.view_all": "Ammustra totu",
+  "follow_suggestions.who_to_follow": "Chie sighire",
+  "followed_tags": "Etichetas sighidas",
   "footer.about": "Informatziones",
   "footer.directory": "Diretòriu de profilos",
   "footer.get_app": "Otene s'aplicatzione",
@@ -302,6 +329,11 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}} oe",
   "hashtag.follow": "Sighi su hashtag",
   "hashtag.unfollow": "Non sigas prus s'eticheta",
+  "hashtags.and_other": "… e {count, plural, one {un'àteru} other {àteros #}}",
+  "hints.profiles.posts_may_be_missing": "Podet èssere chi ammanchent tzertas publicatziones de custu profilu.",
+  "hints.profiles.see_more_posts": "Bide prus publicatziones a {domain}",
+  "hints.threads.replies_may_be_missing": "Podet èssere chi ammanchent rispostas dae àteros serbidores.",
+  "hints.threads.see_more": "Bide prus rispostas a {domain}",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
@@ -309,7 +341,14 @@
   "home.pending_critical_update.link": "Ammustra is atualizatziones",
   "home.pending_critical_update.title": "Atualizatzione de seguresa crìtica a disponimentu.",
   "home.show_announcements": "Ammustra annùntzios",
+  "ignore_notifications_modal.disclaimer": "Mastodon non podet informare is utentes chi as innioradu is notìficas issoro. Inniorare notìficas no at a evitare chi s'imbient is messàgios.",
+  "ignore_notifications_modal.filter_instead": "Opuru filtra",
+  "ignore_notifications_modal.filter_to_act_users": "As a pòdere ancora atzetare, refudare o sinnalare a utentes",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrare agiudat a evitare possìbiles confusiones",
   "interaction_modal.description.reply": "Podes rispòndere a custa publicatzione cun unu contu de Mastodon.",
+  "interaction_modal.login.action": "Torra a sa pàgina printzipale",
+  "interaction_modal.login.prompt": "Su domìniu de su serbidore domèsticu tuo, pro esempru mastodon.social",
+  "interaction_modal.no_account_yet": "Non ses in Mastodon?",
   "interaction_modal.on_this_server": "In custu serbidore",
   "interaction_modal.title.follow": "Sighi a {name}",
   "interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
@@ -353,11 +392,13 @@
   "lightbox.next": "Imbeniente",
   "lightbox.previous": "Pretzedente",
   "limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.",
+  "link_preview.shares": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "lists.account.add": "Agiunghe a sa lista",
   "lists.account.remove": "Boga dae sa lista",
   "lists.delete": "Cantzella sa lista",
   "lists.edit": "Modìfica sa lista",
   "lists.edit.submit": "Muda su tìtulu",
+  "lists.exclusive": "Cua custas publicatziones dae sa pàgina printzipale",
   "lists.new.create": "Agiunghe lista",
   "lists.new.title_placeholder": "Tìtulu de sa lista noa",
   "lists.replies_policy.followed": "Cale si siat persone chi sighis",
@@ -368,7 +409,20 @@
   "lists.subheading": "Is listas tuas",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende…",
+  "media_gallery.hide": "Cua",
+  "moved_to_account_banner.text": "Su contu tuo {disabledAccount} est disativadu in custu momentu ca est istadu tramudadu a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Cua dae is notìficas",
+  "mute_modal.hide_options": "Cua is optziones",
+  "mute_modal.indefinite": "Fintzas a cando no apo a torrare a ativare is notìficas",
+  "mute_modal.show_options": "Ammustra is optziones",
+  "mute_modal.they_can_mention_and_follow": "Ti podent mentovare e sighire, però no ddos as a bìdere.",
+  "mute_modal.they_wont_know": "No ant a ischire chi ddos as postu a sa muda.",
+  "mute_modal.title": "Boles pònnere a custu contu a sa muda?",
+  "mute_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent a custa persone.",
+  "mute_modal.you_wont_see_posts": "At a pòdere bìdere is publicatziones tuas, però tue no as a bìdere cussas suas.",
   "navigation_bar.about": "Informatziones",
+  "navigation_bar.administration": "Amministratzione",
+  "navigation_bar.advanced_interface": "Aberi s'interfache web avantzada",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.community_timeline": "Lìnia de tempus locale",
@@ -380,10 +434,13 @@
   "navigation_bar.favourites": "Preferidos",
   "navigation_bar.filters": "Faeddos a sa muda",
   "navigation_bar.follow_requests": "Rechestas de sighidura",
+  "navigation_bar.followed_tags": "Etichetas sighidas",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
   "navigation_bar.lists": "Listas",
   "navigation_bar.logout": "Essi",
+  "navigation_bar.moderation": "Moderatzione",
   "navigation_bar.mutes": "Persones a sa muda",
+  "navigation_bar.opened_in_classic_interface": "Publicatziones, contos e àteras pàginas ispetzìficas sunt abertas in manera predefinida in s'interfache web clàssica.",
   "navigation_bar.personal": "Informatziones personales",
   "navigation_bar.pins": "Publicatziones apicadas",
   "navigation_bar.preferences": "Preferèntzias",
@@ -391,10 +448,23 @@
   "navigation_bar.search": "Chirca",
   "navigation_bar.security": "Seguresa",
   "not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
+  "notification.admin.report": "{name} at sinnaladu a {target}",
+  "notification.admin.report_account": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target} pro {category}",
+  "notification.admin.report_account_other": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target}",
+  "notification.admin.report_statuses": "{name} at sinnaladu a {target} pro {category}",
+  "notification.admin.report_statuses_other": "{name} at sinnaladu a {target}",
   "notification.admin.sign_up": "{name} at aderidu",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {un'àtera persone} other {àteras # persones}} si sunt registradas",
   "notification.favourite": "{name} at marcadu comente a preferidu s'istadu tuo",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {un'àtera persone} other {àteras # persones}}</a> ant marcadu sa publicatzione tua comente preferida",
   "notification.follow": "{name} ti sighit",
   "notification.follow_request": "{name} at dimandadu de ti sighire",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {un'àtera persone} other {àteras # persones}} ant pedidu de ti sighire",
+  "notification.label.mention": "Mèntovu",
+  "notification.label.private_mention": "Mèntovu privadu",
+  "notification.label.private_reply": "Risposta privada",
+  "notification.label.reply": "Risposta",
+  "notification.mention": "Mèntovu",
   "notification.moderation-warning.learn_more": "Àteras informatziones",
   "notification.moderation_warning": "T'ant imbiadu un'avisu de moderatzione",
   "notification.moderation_warning.action_delete_statuses": "Unas cantas de is publicatziones tuas sunt istadas cantzelladas.",
@@ -407,12 +477,30 @@
   "notification.own_poll": "Sondàgiu acabbadu",
   "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
   "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {un'àtera persone} other {àteras # persones}}</a> ant potentziadu sa publicatzione tua",
   "notification.relationships_severance_event": "Connessiones pèrdidas cun {name}",
+  "notification.relationships_severance_event.account_suspension": "S'amministratzione de {from} at suspèndidu a {target}; custu bolet nàrrere chi non podes prus retzire atualizatziones dae in cue o interagire cun cussos contos.",
+  "notification.relationships_severance_event.domain_block": "S'amministratzione de {from} at blocadu a {target}, incluende {followersCount} sighiduras tuas e {followingCount, plural, one {un'àteru contu} other {àteros # contos}} chi sighis.",
   "notification.relationships_severance_event.learn_more": "Àteras informatziones",
+  "notification.relationships_severance_event.user_domain_block": "As blocadu a {target}, bogadu a {followersCount} contos chi ti sighint e {followingCount, plural, one {un'àteru contu} other {àteros # contos}} chi sighis.",
   "notification.status": "{name} at publicadu cosa",
   "notification.update": "{name} at modificadu una publicatzione",
   "notification_requests.accept": "Atzeta",
+  "notification_requests.accept_multiple": "{count, plural, one {Atzeta una rechesta…} other {Atzeta # rechestas…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Atzeta sa rechesta} other {Atzeta is rechestas}}",
+  "notification_requests.confirm_accept_multiple.message": "Ses atzetende {count, plural, one {una rechesta de notìfica} other {# rechestas de notìfica}}. Seguru chi boles sighire?",
+  "notification_requests.confirm_accept_multiple.title": "Boles atzetare is rechestas de notìfica?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Iscarta sa rechesta} other {Iscarta is rechestas}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Ses acanta de iscartare {count, plural, one {una rechesta de notìfica} other {# rechestas de notìfica}}. No nche {count, plural, one {} other {}} as a pòdere prus atzèdere in manera sèmplitze. Seguru chi boles sighire?",
+  "notification_requests.confirm_dismiss_multiple.title": "Boles iscartare is rechestas de notìfica?",
   "notification_requests.dismiss": "Iscarta",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Iscarta una rechesta…} other {Iscarta # rechestas…}}",
+  "notification_requests.edit_selection": "Modifica",
+  "notification_requests.exit_selection": "Fatu",
+  "notification_requests.explainer_for_limited_account": "Is notìficas de custu contu sunt istadas filtradas, ca su contu est istadu limitadu dae sa moderatzione.",
+  "notification_requests.explainer_for_limited_remote_account": "Is notìficas de custu contu sunt istadas filtradas, ca su contu o su serbidore suo est istadu limitadu dae sa moderatzione.",
+  "notification_requests.maximize": "Ismànnia",
+  "notification_requests.minimize_banner": "Mìnima su bànner de notìficas filtradas",
   "notification_requests.notifications_from": "Notìficas dae {name}",
   "notification_requests.title": "Notìficas filtradas",
   "notifications.clear": "Lìmpia notìficas",
@@ -472,6 +560,11 @@
   "poll_button.add_poll": "Agiunghe unu sondàgiu",
   "poll_button.remove_poll": "Cantzella su sondàgiu",
   "privacy.change": "Modìfica s'istadu de riservadesa",
+  "privacy.direct.long": "Totu is utentes mentovados in sa publicatzione",
+  "privacy.direct.short": "Persones ispetzìficas",
+  "privacy.private.long": "Isceti chie ti sighit",
+  "privacy.private.short": "Sighiduras",
+  "privacy.public.long": "Cale si siat persone a intro o a foras de Mastodon",
   "privacy.public.short": "Pùblicu",
   "privacy_policy.last_updated": "Ùrtima atualizatzione: {date}",
   "privacy_policy.title": "Polìtica de riservadesa",
@@ -497,34 +590,64 @@
   "report.categories.legal": "Giurìdicu",
   "report.categories.other": "Àteru",
   "report.categories.spam": "Àliga",
+  "report.category.subtitle": "Sèbera sa currispondèntzia prus arta",
+  "report.category.title": "Nara·nos ite sutzedet cun custu {type}",
   "report.category.title_account": "profilu",
   "report.category.title_status": "publicatzione",
   "report.close": "Fatu",
+  "report.comment.title": "Nch'at àteru chi depamus ischire?",
   "report.forward": "Torra a imbiare a {target}",
   "report.forward_hint": "Custu contu est de un'àteru serbidore. Ddi boles imbiare puru una còpia anònima de custu informe?",
   "report.mute": "A sa muda",
+  "report.mute_explanation": "No as a bìdere is publicatziones suas. Ti podet ancora sighire e bìdere is publicatziones, ma no at a ischire chi dd'as postu a sa muda.",
   "report.next": "Imbeniente",
   "report.placeholder": "Cummentos additzionales",
   "report.reasons.dislike": "Non mi praghet",
   "report.reasons.dislike_description": "Est una cosa chi non boles bìdere",
   "report.reasons.legal": "Illegale",
   "report.reasons.other": "Un'àtera cosa",
+  "report.reasons.other_description": "Su problema non currispondet a is àteras categorias",
   "report.reasons.spam": "Est àliga",
+  "report.rules.subtitle": "Seletziona totu is chi àplichent",
+  "report.statuses.subtitle": "Seletziona totu is chi àplichent",
   "report.submit": "Imbia",
   "report.target": "Informende de {target}",
+  "report.thanks.title": "Non boles bìdere custu?",
+  "report.thanks.title_actionable": "Gràtzias de sa sinnalatzione, dd'amus a averiguare.",
   "report.unfollow": "Non sigas prus a @{name}",
+  "report.unfollow_explanation": "Ses sighende custu contu. Si non boles bìdere is publicatziones suas in sa pàgina printzipale tua, no ddu sigas prus.",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "Giurìdicu",
   "report_notification.categories.legal_sentence": "cuntenutu illegale",
   "report_notification.categories.other": "Àteru",
   "report_notification.categories.other_sentence": "àteru",
   "report_notification.categories.spam": "Àliga",
+  "report_notification.categories.spam_sentence": "àliga",
+  "report_notification.open": "Aberi una sinnalatzione",
+  "search.no_recent_searches": "Nissuna chirca reghente",
   "search.placeholder": "Chirca",
+  "search.quick_action.account_search": "Profilos chi currispondent cun {x}",
+  "search.quick_action.go_to_account": "Bae a su profilu {x}",
+  "search.quick_action.go_to_hashtag": "Bae a s'eticheta {x}",
+  "search.quick_action.open_url": "Aberi s'URL in Mastodon",
+  "search.quick_action.status_search": "Publicatziones chi currispondent cun {x}",
+  "search.search_or_paste": "Chirca o incolla un'URL",
+  "search_popout.full_text_search_disabled_message": "No a disponimentu a {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Isceti a disponimentu cun sa sessione aberta.",
+  "search_popout.language_code": "Còdighe de limba ISO",
+  "search_popout.options": "Optziones de chirca",
+  "search_popout.quick_actions": "Atziones lestras",
+  "search_popout.recent": "Chircas reghentes",
+  "search_popout.specific_date": "data ispetzìfica",
   "search_popout.user": "utente",
   "search_results.accounts": "Profilos",
   "search_results.all": "Totus",
   "search_results.hashtags": "Etichetas",
+  "search_results.nothing_found": "Impossìbile agatare currispondèntzias pro custos tèrmines de chirca",
+  "search_results.see_all": "Bide totu",
   "search_results.statuses": "Publicatziones",
+  "search_results.title": "Chirca {q}",
+  "server_banner.about_active_users": "Gente chi at impreadu custu serbidore is ùrtimas 30 dies (Utentes cun Atividade a su Mese)",
   "server_banner.active_users": "utentes ativos",
   "server_banner.administered_by": "Amministradu dae:",
   "server_banner.server_stats": "Istatìsticas de su serbidore:",

app/javascript/mastodon/locales/sk.json

@@ -33,7 +33,7 @@
   "account.follow": "Sledovať",
   "account.follow_back": "Sledovať späť",
   "account.followers": "Sledovatelia",
-  "account.followers.empty": "Tento účet ešte nikto nesleduje.",
+  "account.followers.empty": "Ešte nikto nesleduje tohto užívateľa.",
   "account.followers_counter": "{count, plural, one {{counter} sledujúci} other {{counter} sledujúci}}",
   "account.following": "Sledovaný účet",
   "account.following_counter": "{count, plural, one {{counter} sledovaných} other {{counter} sledovaných}}",
@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Priveľa žiadostí",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
+  "alt_text_badge.title": "Alternatívny popis",
   "announcement.announcement": "Oznámenie",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",

app/javascript/mastodon/locales/sq.json

@@ -508,7 +508,6 @@
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
   "notification.favourite.name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a> i vunë shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",
-  "notification.follow.name_and_others": "Ju ndoqi {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.follow_request.name_and_others": "Ka kërkuar t’ju ndjekë {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.label.mention": "Përmendje",
@@ -516,6 +515,7 @@
   "notification.label.private_reply": "Përgjigje private",
   "notification.label.reply": "Përgjigje",
   "notification.mention": "Përmendje",
+  "notification.mentioned_you": "{name} ju ka përmendur",
   "notification.moderation-warning.learn_more": "Mësoni më tepër",
   "notification.moderation_warning": "Ju është dhënë një sinjalizim moderimi",
   "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
@@ -852,6 +852,11 @@
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
   "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
   "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
+  "upload_form.drag_and_drop.instructions": "Që të merrni një bashkëngjitje media, shtypni tastin Space ose Enter. Teksa bëhet tërheqje, përdorni tastet shigjetë për ta shpënë bashkëngjitjen media në cilëndo drejtori që doni. Shtypni sërish Space ose Enter që të lihet bashkëngjitja media në pozicionin e vet të ri, ose shtypni Esc, që të anulohet veprimi.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Tërheqja u anulua. Bashkëngjitja media {item} u la.",
+  "upload_form.drag_and_drop.on_drag_end": "Bashkëngjitja media {item} u la.",
+  "upload_form.drag_and_drop.on_drag_over": "Bashkëngjitja media {item} u lëviz.",
+  "upload_form.drag_and_drop.on_drag_start": "U mor bashkëngjitja media {item}.",
   "upload_form.edit": "Përpunoni",
   "upload_form.thumbnail": "Ndryshoni miniaturën",
   "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",

app/javascript/mastodon/locales/sv.json

@@ -85,6 +85,7 @@
   "alert.rate_limited.title": "Mängd begränsad",
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
   "alert.unexpected.title": "Hoppsan!",
+  "alt_text_badge.title": "Alt-Text",
   "announcement.announcement": "Meddelande",
   "attachments_list.unprocessed": "(obehandlad)",
   "audio.hide": "Dölj audio",
@@ -97,6 +98,8 @@
   "block_modal.title": "Blockera användare?",
   "block_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "boost_modal.combo": "Du kan trycka på {combo} för att hoppa över detta nästa gång",
+  "boost_modal.reblog": "Boosta inlägg?",
+  "boost_modal.undo_reblog": "Avboosta inlägg?",
   "bundle_column_error.copy_stacktrace": "Kopiera felrapport",
   "bundle_column_error.error.body": "Den begärda sidan kunde inte visas. Det kan bero på ett fel i vår kod eller ett problem med webbläsarens kompatibilitet.",
   "bundle_column_error.error.title": "Åh nej!",
@@ -219,6 +222,8 @@
   "domain_block_modal.they_cant_follow": "Ingen från denna server kan följa dig.",
   "domain_block_modal.they_wont_know": "De kommer inte veta att de har blockerats.",
   "domain_block_modal.title": "Blockera domän?",
+  "domain_block_modal.you_will_lose_num_followers": "Du kommer att förlora {followersCount, plural, other {{followersCountDisplay} följare}} och {followingCount, plural, one {{followingCountDisplay} person du följer} other {{followingCountDisplay} personer du följer}}.",
+  "domain_block_modal.you_will_lose_relationships": "Du kommer att förlora alla följare och personer du följer från denna server.",
   "domain_block_modal.you_wont_see_posts": "Du kommer inte att se inlägg eller meddelanden från användare på den här servern.",
   "domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
   "domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
@@ -300,6 +305,7 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
+  "filter_warning.matches_filter": "Matchar filtret \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
@@ -430,6 +436,8 @@
   "lightbox.close": "Stäng",
   "lightbox.next": "Nästa",
   "lightbox.previous": "Tidigare",
+  "lightbox.zoom_in": "Zooma till faktisk storlek",
+  "lightbox.zoom_out": "Zooma för att passa",
   "limited_account_hint.action": "Visa profil ändå",
   "limited_account_hint.title": "Denna profil har dolts av {domain}s moderatorer.",
   "link_preview.author": "Av {name}",
@@ -463,6 +471,7 @@
   "mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
   "mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
   "navigation_bar.about": "Om",
+  "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
   "navigation_bar.blocks": "Blockerade användare",
   "navigation_bar.bookmarks": "Bokmärken",
@@ -479,6 +488,7 @@
   "navigation_bar.follows_and_followers": "Följer och följare",
   "navigation_bar.lists": "Listor",
   "navigation_bar.logout": "Logga ut",
+  "navigation_bar.moderation": "Moderering",
   "navigation_bar.mutes": "Tystade användare",
   "navigation_bar.opened_in_classic_interface": "Inlägg, konton och andra specifika sidor öppnas som standard i det klassiska webbgränssnittet.",
   "navigation_bar.personal": "Personligt",
@@ -498,7 +508,6 @@
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
   "notification.favourite.name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> har favoritmarkerat ditt inlägg",
   "notification.follow": "{name} följer dig",
-  "notification.follow.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.follow_request.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har bett att följa dig",
   "notification.label.mention": "Nämn",
@@ -506,6 +515,7 @@
   "notification.label.private_reply": "Privata svar",
   "notification.label.reply": "Svar",
   "notification.mention": "Nämn",
+  "notification.mentioned_you": "{name} nämnde dig",
   "notification.moderation-warning.learn_more": "Läs mer",
   "notification.moderation_warning": "Du har fått en moderationsvarning",
   "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
@@ -770,6 +780,7 @@
   "status.bookmark": "Bokmärk",
   "status.cancel_reblog_private": "Sluta boosta",
   "status.cannot_reblog": "Detta inlägg kan inte boostas",
+  "status.continued_thread": "Fortsatt tråd",
   "status.copy": "Kopiera inläggslänk",
   "status.delete": "Radera",
   "status.detailed_status": "Detaljerad samtalsvy",
@@ -803,6 +814,7 @@
   "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
   "status.redraft": "Radera & gör om",
   "status.remove_bookmark": "Ta bort bokmärke",
+  "status.replied_in_thread": "Svarade i tråden",
   "status.replied_to": "Svarade på {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara på tråden",
@@ -840,6 +852,11 @@
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
   "upload_form.audio_description": "Beskriv för personer med hörselnedsättning",
   "upload_form.description": "Beskriv för synskadade",
+  "upload_form.drag_and_drop.instructions": "För att plocka upp en mediebilaga, tryck på mellanslag eller enter. Använd piltangenterna för att flytta mediebilagan. Tryck på mellanslag eller enter igen för att släppa mediebilagan i sin nya position, eller tryck på escape för att avbryta.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Flytten avbröts. Mediebilagan {item} släpptes.",
+  "upload_form.drag_and_drop.on_drag_end": "Mediebilagan {item} släpptes.",
+  "upload_form.drag_and_drop.on_drag_over": "Mediebilagan {item} flyttades.",
+  "upload_form.drag_and_drop.on_drag_start": "Mediebilagan {item} plockades upp.",
   "upload_form.edit": "Redigera",
   "upload_form.thumbnail": "Ändra miniatyr",
   "upload_form.video_description": "Beskriv för personer med hörsel- eller synnedsättning",

app/javascript/mastodon/locales/th.json

@@ -222,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": "โปรโตคอลช่วยให้คุณเชื่อมต่อและโต้ตอบกับผู้คนไม่ใช่แค่ใน Mastodon แต่ทั่วทั้งแอปสังคมต่าง ๆ เช่นกัน",
   "domain_pill.activitypub_like_language": "ActivityPub เป็นเหมือนภาษาที่ Mastodon พูดกับเครือข่ายสังคมอื่น ๆ",
@@ -434,6 +436,8 @@
   "lightbox.close": "ปิด",
   "lightbox.next": "ถัดไป",
   "lightbox.previous": "ก่อนหน้า",
+  "lightbox.zoom_in": "ซูมเป็นขนาดจริง",
+  "lightbox.zoom_out": "ซูมให้พอดี",
   "limited_account_hint.action": "แสดงโปรไฟล์ต่อไป",
   "limited_account_hint.title": "มีการซ่อนโปรไฟล์นี้โดยผู้กลั่นกรองของ {domain}",
   "link_preview.author": "โดย {name}",
@@ -504,7 +508,6 @@
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.favourite.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
-  "notification.follow.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
   "notification.follow_request.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ขอติดตามคุณ",
   "notification.label.mention": "การกล่าวถึง",
@@ -512,6 +515,7 @@
   "notification.label.private_reply": "การตอบกลับแบบส่วนตัว",
   "notification.label.reply": "การตอบกลับ",
   "notification.mention": "การกล่าวถึง",
+  "notification.mentioned_you": "{name} ได้กล่าวถึงคุณ",
   "notification.moderation-warning.learn_more": "เรียนรู้เพิ่มเติม",
   "notification.moderation_warning": "คุณได้รับคำเตือนการกลั่นกรอง",
   "notification.moderation_warning.action_delete_statuses": "เอาโพสต์บางส่วนของคุณออกแล้ว",

app/javascript/mastodon/locales/tr.json

@@ -124,7 +124,7 @@
   "column.direct": "Özel değinmeler",
   "column.directory": "Profillere göz at",
   "column.domain_blocks": "Engellenen alan adları",
-  "column.favourites": "Favorilerin",
+  "column.favourites": "Gözdelerin",
   "column.firehose": "Anlık Akışlar",
   "column.follow_requests": "Takip istekleri",
   "column.home": "Anasayfa",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} gönderinizi beğendi",
   "notification.favourite.name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer kişi} other {# diğer kişi}}</a> gönderinizi beğendi",
   "notification.follow": "{name} seni takip etti",
-  "notification.follow.name_and_others": "{name} ve {count, plural, one {# diğer kişi} other {# diğer kişi}} sizi takip etti",
+  "notification.follow.name_and_others": "{name} ve <a>{count, plural, one {# diğer kişi} other {# diğer kişi}}</a> sizi takip etti",
   "notification.follow_request": "{name} size takip isteği gönderdi",
   "notification.follow_request.name_and_others": "{name} ve {count, plural, one {# diğer kişi} other {# diğer kişi}} size takip etme isteği gönderdi",
   "notification.label.mention": "Bahsetme",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Özel yanıt",
   "notification.label.reply": "Yanıt",
   "notification.mention": "Bahsetme",
+  "notification.mentioned_you": "{name} sizden söz etti",
   "notification.moderation-warning.learn_more": "Daha fazlası",
   "notification.moderation_warning": "Hesabınız bir denetim uyarısı aldı",
   "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Hızlı filtre çubuğu",
   "notifications.column_settings.follow": "Yeni takipçiler:",
   "notifications.column_settings.follow_request": "Yeni takip istekleri:",
+  "notifications.column_settings.group": "Grupla",
   "notifications.column_settings.mention": "Bahsetmeler:",
   "notifications.column_settings.poll": "Anket sonuçları:",
   "notifications.column_settings.push": "Anlık bildirimler",
@@ -812,7 +814,7 @@
   "status.reblogged_by": "{name} yeniden paylaştı",
   "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
   "status.reblogs.empty": "Henüz hiç kimse bu gönderiyi yeniden paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
-  "status.redraft": "Sil,Düzenle ve Yeniden paylaş",
+  "status.redraft": "Sil,Düzenle ve yeniden-paylaş",
   "status.remove_bookmark": "Yer işaretini kaldır",
   "status.replied_in_thread": "Akışta yanıtlandı",
   "status.replied_to": "{name} kullanıcısına yanıt verdi",
@@ -852,6 +854,11 @@
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
   "upload_form.description": "Görme engelliler için açıklama",
+  "upload_form.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
+  "upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",
+  "upload_form.drag_and_drop.on_drag_over": "Medya eklentisi {item} hareket ettirildi.",
+  "upload_form.drag_and_drop.on_drag_start": "Medya eklentisi {item} tutuldu.",
   "upload_form.edit": "Düzenle",
   "upload_form.thumbnail": "Küçük resmi değiştir",
   "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",

app/javascript/mastodon/locales/uk.json

@@ -508,7 +508,6 @@
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.favourite.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> вподобали ваш допис",
   "notification.follow": "{name} підписалися на вас",
-  "notification.follow.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} стежать за вами",
   "notification.follow_request": "{name} відправили запит на підписку",
   "notification.follow_request.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} надсилають вам запит на стеження",
   "notification.label.mention": "Згадка",
@@ -516,6 +515,7 @@
   "notification.label.private_reply": "Приватна відповідь",
   "notification.label.reply": "Відповідь",
   "notification.mention": "Згадка",
+  "notification.mentioned_you": "{name} згадує вас",
   "notification.moderation-warning.learn_more": "Докладніше",
   "notification.moderation_warning": "Ви отримали попередження модерації",
   "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було вилучено.",
@@ -566,6 +566,7 @@
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
+  "notifications.column_settings.group": "Група",
   "notifications.column_settings.mention": "Згадки:",
   "notifications.column_settings.poll": "Результати опитування:",
   "notifications.column_settings.push": "Push-сповіщення",
@@ -852,6 +853,11 @@
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
   "upload_form.audio_description": "Опишіть для людей із вадами слуху",
   "upload_form.description": "Опишіть для людей з вадами зору",
+  "upload_form.drag_and_drop.instructions": "Щоб вибрати медіавкладення, натисніть пробіл або Enter. Під час перетягування, використайте клавіші зі стрілками для переміщення вкладення в будь-якому напрямку. Натисніть пробіл або Enter знову, щоб залишити медіавкладення в новому положенні, або натисніть клавішу Escape, щоб скасувати.",
+  "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": "Опишіть для людей із вадами слуху або зору",

app/javascript/mastodon/locales/vi.json

@@ -441,7 +441,7 @@
   "limited_account_hint.action": "Vẫn cứ xem",
   "limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên {domain}.",
   "link_preview.author": "Bởi {name}",
-  "link_preview.more_from_author": "Thêm từ {name}",
+  "link_preview.more_from_author": "Viết bởi {name}",
   "link_preview.shares": "{count, plural, other {{counter} lượt chia sẻ}}",
   "lists.account.add": "Thêm vào danh sách",
   "lists.account.remove": "Xóa khỏi danh sách",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} thích tút của bạn",
   "notification.favourite.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã thích tút của bạn",
   "notification.follow": "{name} theo dõi bạn",
-  "notification.follow.name_and_others": "{name} và {count, plural, other {# người khác}} đã theo dõi bạn",
+  "notification.follow.name_and_others": "{name} và <a>{count, plural, other {# người khác}}</a> theo dõi bạn",
   "notification.follow_request": "{name} yêu cầu theo dõi bạn",
   "notification.follow_request.name_and_others": "{name} và {count, plural, other {# người khác}} đã yêu cầu theo dõi bạn",
   "notification.label.mention": "Lượt nhắc",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "Trả lời riêng",
   "notification.label.reply": "Trả lời",
   "notification.mention": "Lượt nhắc",
+  "notification.mentioned_you": "{name} nhắc đến bạn",
   "notification.moderation-warning.learn_more": "Tìm hiểu",
   "notification.moderation_warning": "Bạn vừa nhận một cảnh báo kiểm duyệt",
   "notification.moderation_warning.action_delete_statuses": "Một vài tút của bạn bị gỡ.",
@@ -526,7 +527,7 @@
   "notification.moderation_warning.action_silence": "Tài khoản của bạn đã bị hạn chế.",
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Cuộc bình chọn của bạn đã kết thúc",
-  "notification.poll": "Cuộc bình chọn có bạn tham gia đã kết thúc",
+  "notification.poll": "Cuộc bình chọn mà bạn tham gia đã kết thúc",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.reblog.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Thanh lọc nhanh",
   "notifications.column_settings.follow": "Người theo dõi:",
   "notifications.column_settings.follow_request": "Yêu cầu theo dõi:",
+  "notifications.column_settings.group": "Nhóm",
   "notifications.column_settings.mention": "Lượt nhắc đến:",
   "notifications.column_settings.poll": "Kết quả bình chọn:",
   "notifications.column_settings.push": "Thông báo đẩy",

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

@@ -36,7 +36,7 @@
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
   "account.following": "正在关注",
-  "account.following_counter": "{count, plural, other {{counter} 关注}}",
+  "account.following_counter": "正在关注 {count, plural, other {{counter} 人}}",
   "account.follows.empty": "此用户目前未关注任何人。",
   "account.go_to_profile": "前往个人资料页",
   "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
@@ -59,7 +59,7 @@
   "account.posts_with_replies": "嘟文和回复",
   "account.report": "举报 @{name}",
   "account.requested": "正在等待对方同意。点击取消发送关注请求",
-  "account.requested_follow": "{name} 已经向你发送了关注请求",
+  "account.requested_follow": "{name} 向你发送了关注请求",
   "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
   "account.statuses_counter": "{count, plural, other {{counter} 条嘟文}}",
@@ -94,8 +94,8 @@
   "block_modal.show_more": "显示更多",
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
   "block_modal.they_cant_see_posts": "他们看不到你的嘟文，你也看不到他们的嘟文。",
-  "block_modal.they_will_know": "他们将能看到他们被屏蔽。",
+  "block_modal.they_will_know": "对方将能看到自己被屏蔽。",
-  "block_modal.title": "是否屏蔽该用户？",
+  "block_modal.title": "屏蔽该用户？",
   "block_modal.you_wont_see_mentions": "你将不会看到提及他们的嘟文。",
   "boost_modal.combo": "下次按住 {combo} 即可跳过此提示",
   "boost_modal.reblog": "是否转嘟？",
@@ -204,7 +204,7 @@
   "copy_icon_button.copied": "已复制到剪贴板",
   "copypaste.copied": "已复制",
   "copypaste.copy_to_clipboard": "复制到剪贴板",
-  "directory.federated": "来自已知的联邦宇宙",
+  "directory.federated": "来自已知联邦宇宙",
   "directory.local": "仅来自 {domain}",
   "directory.new_arrivals": "新来者",
   "directory.recently_active": "最近活跃",
@@ -220,24 +220,24 @@
   "domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
   "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
-  "domain_block_modal.they_wont_know": "他们不会知道自己被屏蔽。",
+  "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": "它让你不仅能与Mastodon上的人交流互动，还能与其它不同社交应用上的人联系。",
+  "domain_pill.activitypub_lets_connect": "它让你不仅能与 Mastodon 上的人交流互动，还能与其它不同社交应用上的人联系。",
-  "domain_pill.activitypub_like_language": "ActivityPub就像Mastodon与其它社交网络交流时使用的语言。",
+  "domain_pill.activitypub_like_language": "ActivityPub 好比 Mastodon 与其它社交网络交流时使用的语言。",
   "domain_pill.server": "服务器",
-  "domain_pill.their_handle": "它们的代号：",
+  "domain_pill.their_handle": "对方代号：",
-  "domain_pill.their_server": "它们的数字家园，它们的所有嘟文都存放在那里。",
+  "domain_pill.their_server": "对方的数字家园，对方的所有嘟文都存放在那里。",
-  "domain_pill.their_username": "它们在它们的服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
+  "domain_pill.their_username": "对方在其服务器上的唯一标识符。不同服务器上可能会存在相同用户名的用户。",
   "domain_pill.username": "用户名",
   "domain_pill.whats_in_a_handle": "代号里都有什么？",
-  "domain_pill.who_they_are": "代号可以告诉你一个人是谁和在哪里，所以你可以在社交网络上与<button>由ActivityPub驱动的不同平台</button>的人们互动。",
+  "domain_pill.who_they_are": "代号可以表明用户和其所在站点，你可以在社交网络上与<button>由 ActivityPub 驱动的不同平台</button>的人们互动。",
-  "domain_pill.who_you_are": "你的代号可以告诉别人你是谁和你在哪里，这样社交网络上来自<button>由ActivityPub驱动的不同平台</button>的人们就可以与你互动。",
+  "domain_pill.who_you_are": "代号可以表明你自己和你所在站点，社交网络上来自<button>由 ActivityPub 驱动的不同平台</button>的人们因此可以与你互动。",
   "domain_pill.your_handle": "你的代号：",
   "domain_pill.your_server": "你的数字家园，你的所有嘟文都存放在这里。不喜欢这个服务器吗？随时带上你的关注者一起迁移到其它服务器。",
-  "domain_pill.your_username": "你在这个服务器上的唯一标识符。在不同的服务器上可能会找到相同用户名的用户。",
+  "domain_pill.your_username": "你在这个服务器上的唯一标识符。不同服务器上可能会存在相同用户名的用户。",
   "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
   "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
@@ -465,11 +465,11 @@
   "mute_modal.hide_options": "隐藏选项",
   "mute_modal.indefinite": "直到我取消隐藏他们",
   "mute_modal.show_options": "显示选项",
-  "mute_modal.they_can_mention_and_follow": "他们可以提及和关注你，但是你看不到他们。",
+  "mute_modal.they_can_mention_and_follow": "对方可以提及和关注你，但是你看不到对方。",
-  "mute_modal.they_wont_know": "它们不会知道自己已被隐藏。",
+  "mute_modal.they_wont_know": "对方不会知道自己被隐藏。",
-  "mute_modal.title": "隐藏用户？",
+  "mute_modal.title": "隐藏该用户？",
-  "mute_modal.you_wont_see_mentions": "你看不到提及他们的嘟文。",
+  "mute_modal.you_wont_see_mentions": "你看不到提及对方的嘟文。",
-  "mute_modal.you_wont_see_posts": "他们可以看到你的嘟文，但是你看不到他们的。",
+  "mute_modal.you_wont_see_posts": "对方可以看到你的嘟文，但是你看不到对方的。",
   "navigation_bar.about": "关于",
   "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
@@ -508,7 +508,7 @@
   "notification.favourite": "{name} 喜欢了你的嘟文",
   "notification.favourite.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 喜欢了你的嘟文",
   "notification.follow": "{name} 开始关注你",
-  "notification.follow.name_and_others": "{name} 和 {count, plural, other {另外 # 人}} 关注了你",
+  "notification.follow.name_and_others": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 关注了你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.follow_request.name_and_others": "{name} 和 {count, plural, other {另外 # 人}} 向你发送了关注请求",
   "notification.label.mention": "提及",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "私人回复",
   "notification.label.reply": "回复",
   "notification.mention": "提及",
+  "notification.mentioned_you": "{name} 提到了你",
   "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning": "你收到了一条管理警告",
   "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
@@ -523,15 +524,15 @@
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "你的一些嘟文已被标记为敏感内容。",
   "notification.moderation_warning.action_none": "你的账号收到了管理警告。",
   "notification.moderation_warning.action_sensitive": "今后你的嘟文都会被标记为敏感内容。",
-  "notification.moderation_warning.action_silence": "你的账号已被限制。",
+  "notification.moderation_warning.action_silence": "你的账号已被隐藏。",
-  "notification.moderation_warning.action_suspend": "你的账号已被封禁.",
+  "notification.moderation_warning.action_suspend": "你的账号已被封禁。",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一项投票已结束",
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.reblog.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 转嘟了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
-  "notification.relationships_severance_event.account_suspension": "一名来自 {from} 的管理员已经封禁了{target}，这意味着你将无法再收到他们的更新或与他们互动。",
+  "notification.relationships_severance_event.account_suspension": "来自 {from} 的管理员封禁了 {target}，这意味着你将无法再收到对方的更新或与其互动。",
-  "notification.relationships_severance_event.domain_block": "一名来自 {from} 的管理员已经屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
+  "notification.relationships_severance_event.domain_block": "来自 {from} 的管理员屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
   "notification.relationships_severance_event.learn_more": "了解更多",
   "notification.relationships_severance_event.user_domain_block": "你已经屏蔽了 {target}，移除了你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
   "notification.status": "{name} 刚刚发布嘟文",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "快速筛选栏",
   "notifications.column_settings.follow": "新粉丝：",
   "notifications.column_settings.follow_request": "新关注请求：",
+  "notifications.column_settings.group": "分组",
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票结果：",
   "notifications.column_settings.push": "推送通知",
@@ -780,14 +782,14 @@
   "status.bookmark": "添加到书签",
   "status.cancel_reblog_private": "取消转贴",
   "status.cannot_reblog": "这条嘟文不允许被转嘟",
-  "status.continued_thread": "继续线程",
+  "status.continued_thread": "上接嘟文串",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",
   "status.detailed_status": "详细的对话视图",
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私下提及",
   "status.edit": "编辑",
-  "status.edited": "最近编辑于 {date}",
+  "status.edited": "最后编辑于 {date}",
   "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "获取嵌入代码",
   "status.favourite": "喜欢",
@@ -814,10 +816,10 @@
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
-  "status.replied_in_thread": "已在线程中回复",
+  "status.replied_in_thread": "回复给嘟文串",
   "status.replied_to": "回复给 {name}",
   "status.reply": "回复",
-  "status.replyAll": "回复所有人",
+  "status.replyAll": "回复此嘟文串",
   "status.report": "举报 @{name}",
   "status.sensitive_warning": "敏感内容",
   "status.share": "分享",

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

@@ -508,7 +508,7 @@
   "notification.favourite": "{name} 已將您的嘟文加入最愛",
   "notification.favourite.name_and_others_with_link": "{name} 與<a>{count, plural, other {其他 # 個人}}</a>已將您的嘟文加入最愛",
   "notification.follow": "{name} 已跟隨您",
-  "notification.follow.name_and_others": "{name} 與{count, plural, other {其他 # 個人}}已跟隨您",
+  "notification.follow.name_and_others": "{name} 與<a>{count, plural, other {其他 # 個人}}</a>已跟隨您",
   "notification.follow_request": "{name} 要求跟隨您",
   "notification.follow_request.name_and_others": "{name} 與{count, plural, other {其他 # 個人}}已請求跟隨您",
   "notification.label.mention": "提及",
@@ -516,6 +516,7 @@
   "notification.label.private_reply": "私訊回嘟",
   "notification.label.reply": "回嘟",
   "notification.mention": "提及",
+  "notification.mentioned_you": "{name} 已提及您",
   "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning": "您已收到管理員警告",
   "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
@@ -566,6 +567,7 @@
   "notifications.column_settings.filter_bar.category": "快速過濾器",
   "notifications.column_settings.follow": "新的跟隨者：",
   "notifications.column_settings.follow_request": "新的跟隨請求：",
+  "notifications.column_settings.group": "群組",
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票結果：",
   "notifications.column_settings.push": "推播通知",

app/javascript/mastodon/models/account.ts

@@ -129,6 +129,9 @@ export const accountDefaultValues: AccountShape = {
   hide_collections: false,
   other_settings: AccountOtherSettingsFactory(),
   subscribable: true,
+  // This comes from `ApiMutedAccountJSON`, but we should eventually
+  // store that in a different object.
+  mute_expires_at: null,
 };
 
 const AccountFactory = ImmutableRecord<AccountShape>(accountDefaultValues);

app/javascript/mastodon/reducers/compose.js

@@ -520,7 +520,7 @@ export default function compose(state = initialState, action) {
       .set('isUploadingThumbnail', false)
       .update('media_attachments', list => list.map(item => {
         if (item.get('id') === action.media.id) {
-          return fromJS(action.media);
+          return fromJS(action.media).set('unattached', item.get('unattached'));
         }
 
         return item;

app/javascript/mastodon/reducers/notification_groups.ts

@@ -29,6 +29,7 @@ import {
 import type {
   ApiNotificationJSON,
   ApiNotificationGroupJSON,
+  NotificationType,
 } from 'mastodon/api_types/notifications';
 import { compareId } from 'mastodon/compare_id';
 import { usePendingItems } from 'mastodon/initial_state';
@@ -204,7 +205,15 @@ function mergeGapsAround(
 function processNewNotification(
   groups: NotificationGroupsState['groups'],
   notification: ApiNotificationJSON,
+  groupedTypes: NotificationType[],
 ) {
+  if (!groupedTypes.includes(notification.type)) {
+    notification = {
+      ...notification,
+      group_key: `ungrouped-${notification.id}`,
+    };
+  }
+
   const existingGroupIndex = groups.findIndex(
     (group) =>
       group.type !== 'gap' && group.group_key === notification.group_key,
@@ -277,7 +286,7 @@ function processNewNotification(
       groups.unshift(existingGroup);
     }
   } else {
-    // Create a new group
+    // We have not found an existing group, create a new one
     groups.unshift(createNotificationGroupFromNotificationJSON(notification));
   }
 }
@@ -503,11 +512,13 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
         trimNotifications(state);
       })
       .addCase(processNewNotificationForGroups.fulfilled, (state, action) => {
-        const notification = action.payload;
+        if (action.payload) {
-        if (notification) {
+          const { notification, groupedTypes } = action.payload;
+
           processNewNotification(
             usePendingItems ? state.pendingGroups : state.groups,
             notification,
+            groupedTypes,
           );
           updateLastReadId(state);
           trimNotifications(state);
@@ -586,7 +597,10 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
           compareId(state.lastReadId, mostRecentGroup.page_max_id) < 0
         )
           state.lastReadId = mostRecentGroup.page_max_id;
-        commitLastReadId(state);
+
+        // We don't call `commitLastReadId`, because that is conditional
+        // and we want to unconditionally update the state instead.
+        state.readMarkerId = state.lastReadId;
       })
       .addCase(fetchMarkers.fulfilled, (state, action) => {
         if (

app/javascript/mastodon/reducers/settings.js

@@ -91,6 +91,10 @@ const initialState = ImmutableMap({
       'admin.sign_up': true,
       'admin.report': true,
     }),
+
+    group: ImmutableMap({
+      follow: true
+    }),
   }),
 
   firehose: ImmutableMap({

app/javascript/mastodon/selectors/filters.ts

@@ -0,0 +1,50 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import type { RootState } from 'mastodon/store';
+import { toServerSideType } from 'mastodon/utils/filters';
+
+// TODO: move to `app/javascript/mastodon/models` and use more globally
+type Filter = Immutable.Map<string, unknown>;
+
+// TODO: move to `app/javascript/mastodon/models` and use more globally
+type FilterResult = Immutable.Map<string, unknown>;
+
+export const getFilters = createSelector(
+  [
+    (state: RootState) => state.filters as Immutable.Map<string, Filter>,
+    (_, { contextType }: { contextType: string }) => contextType,
+  ],
+  (filters, contextType) => {
+    if (!contextType) {
+      return null;
+    }
+
+    const now = new Date();
+    const serverSideType = toServerSideType(contextType);
+
+    return filters.filter((filter) => {
+      const context = filter.get('context') as Immutable.List<string>;
+      const expiration = filter.get('expires_at') as Date | null;
+      return (
+        context.includes(serverSideType) &&
+        (expiration === null || expiration > now)
+      );
+    });
+  },
+);
+
+export const getStatusHidden = (
+  state: RootState,
+  { id, contextType }: { id: string; contextType: string },
+) => {
+  const filters = getFilters(state, { contextType });
+  if (filters === null) return false;
+
+  const filtered = state.statuses.getIn([id, 'filtered']) as
+    | Immutable.List<FilterResult>
+    | undefined;
+  return filtered?.some(
+    (result) =>
+      filters.getIn([result.get('filter'), 'filter_action']) === 'hide',
+  );
+};

app/javascript/mastodon/selectors/index.js

@@ -1,23 +1,12 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 
-import { toServerSideType } from 'mastodon/utils/filters';
-
 import { me, isHideItem } from '../initial_state';
 
+import { getFilters } from './filters';
+
 export { makeGetAccount } from "./accounts";
 
-const getFilters = createSelector([state => state.get('filters'), (_, { contextType }) => contextType], (filters, contextType) => {
-  if (!contextType) {
-    return null;
-  }
-
-  const now = new Date();
-  const serverSideType = toServerSideType(contextType);
-
-  return filters.filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || filter.get('expires_at') > now));
-});
-
 export const makeGetStatus = () => {
   return createSelector(
     [

app/javascript/mastodon/selectors/settings.ts

@@ -52,4 +52,7 @@ export const selectSettingsNotificationsMinimizeFilteredBanner = (
 ) =>
   state.settings.getIn(['notifications', 'minimizeFilteredBanner']) as boolean;
 
+export const selectSettingsNotificationsGroupFollows = (state: RootState) =>
+  state.settings.getIn(['notifications', 'group', 'follow']) as boolean;
+
 /* eslint-enable @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access */

app/javascript/mastodon/service_worker/web_push_locales.js

@@ -6,6 +6,12 @@
 const fs   = require('fs');
 const path = require('path');
 
+const { defineMessages } = require('react-intl');
+
+const messages = defineMessages({
+  mentioned_you: { id: 'notification.mentioned_you', defaultMessage: '{name} mentioned you' },
+});
+
 const filtered  = {};
 const filenames = fs.readdirSync(path.resolve(__dirname, '../locales'));
 
@@ -20,7 +26,7 @@ filenames.forEach(filename => {
     'notification.favourite': full['notification.favourite'] || '',
     'notification.follow': full['notification.follow'] || '',
     'notification.follow_request': full['notification.follow_request'] || '',
-    'notification.mention': full['notification.mention'] || '',
+    'notification.mention': full[messages.mentioned_you.id] || '',
     'notification.reblog': full['notification.reblog'] || '',
     'notification.poll': full['notification.poll'] || '',
     'notification.status': full['notification.status'] || '',