Merge pull request #1004 from kmycode/kb-draft-15.13-lts

Release: 15.13-lts

.bundler-audit.yml

@@ -0,0 +1,6 @@
+ignore:
+  - CVE-2024-53985
+  - CVE-2024-53986
+  - CVE-2024-53987
+  - CVE-2024-53988
+  - CVE-2024-53989

.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/actions/setup-ruby/action.yml

@@ -21,3 +21,4 @@ runs:
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true
+        cache-version: 4.3

.github/workflows/build-security.yml

@@ -24,8 +24,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon
@@ -46,8 +44,6 @@ jobs:
     uses: ./.github/workflows/build-container-image.yml
     with:
       file_to_build: streaming/Dockerfile
-      platforms: linux/amd64,linux/arm64
-      use_native_arm64_builder: true
       cache: false
       push_to_images: |
         tootsuite/mastodon-streaming

.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

@@ -131,6 +131,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -147,7 +148,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: |
@@ -233,6 +234,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
     steps:
       - uses: actions/checkout@v4
 
@@ -249,7 +251,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'
@@ -313,6 +315,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
 
     steps:
       - uses: actions/checkout@v4
@@ -330,7 +333,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
@@ -430,6 +433,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '.ruby-version'
+          - '3.4'
         search-image:
           - docker.elastic.co/elasticsearch/elasticsearch:7.17.13
         include:
@@ -450,7 +454,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,216 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.3.0] - UNRELEASED
+## [4.3.8] - 2025-05-06
+
+### Security
+
+- Update dependencies
+- Check scheme on account, profile, and media URLs ([GHSA-x2rc-v5wx-g3m5](https://github.com/mastodon/mastodon/security/advisories/GHSA-x2rc-v5wx-g3m5))
+
+### Added
+
+- Add warning for REDIS_NAMESPACE deprecation at startup (#34581 by @ClearlyClaire)
+- Add built-in context for interaction policies (#34574 by @ClearlyClaire)
+
+### Changed
+
+- Change activity distribution error handling to skip retrying for deleted accounts (#33617 by @ClearlyClaire)
+
+### Removed
+
+- Remove double-query for signed query strings (#34610 by @ClearlyClaire)
+
+### Fixed
+
+- Fix incorrect redirect in response to unauthenticated API requests in limited federation mode (#34549 by @ClearlyClaire)
+- Fix sign-up e-mail confirmation page reloading on error or redirect (#34548 by @ClearlyClaire)
+
+## [4.3.7] - 2025-04-02
+
+### Added
+
+- Add delay to profile updates to debounce them (#34137 by @ClearlyClaire)
+- Add support for paginating partial collections in `SynchronizeFollowersService` (#34272 and #34277 by @ClearlyClaire)
+
+### Changed
+
+- Change account suspensions to be federated to recently-followed accounts as well (#34294 by @ClearlyClaire)
+- Change `AccountReachFinder` to consider statuses based on suspension date (#32805 and #34291 by @ClearlyClaire and @mjankowski)
+- Change user archive signed URL TTL from 10 seconds to 1 hour (#34254 by @ClearlyClaire)
+
+### Fixed
+
+- Fix static version of animated PNG emojis not being properly extracted (#34337 by @ClearlyClaire)
+- Fix filters not applying in detailed view, favourites and bookmarks (#34259 and #34260 by @ClearlyClaire)
+- Fix handling of malformed/unusual HTML (#34201 by @ClearlyClaire)
+- Fix `CacheBuster` being queued for missing media attachments (#34253 by @ClearlyClaire)
+- Fix incorrect URL being used when cache busting (#34189 by @ClearlyClaire)
+- Fix streaming server refusing unix socket path in `DATABASE_URL` (#34091 by @ClearlyClaire)
+- Fix “x” hotkey not working on boosted filtered posts (#33758 by @ClearlyClaire)
+
+## [4.3.6] - 2025-03-13
+
+### Security
+
+- Update dependency `omniauth-saml`
+- Update dependency `rack`
+
+### Fixed
+
+- Fix Stoplight errors when using `REDIS_NAMESPACE` (#34126 by @ClearlyClaire)
+
+## [4.3.5] - 2025-03-10
+
+### Changed
+
+- Change hashtag suggestion to prefer personal history capitalization (#34070 by @ClearlyClaire)
+
+### Fixed
+
+- Fix processing errors for some HEIF images from iOS 18 (#34086 by @renchap)
+- Fix streaming server not filtering unknown-language posts from public timelines (#33774 by @ClearlyClaire)
+- Fix preview cards under Content Warnings not being shown in detailed statuses (#34068 by @ClearlyClaire)
+- Fix username and display name being hidden on narrow screens in moderation interface (#33064 by @ClearlyClaire)
+
+## [4.3.4] - 2025-02-27
+
+### Security
+
+- Update dependencies
+- Change HTML sanitization to remove unusable and unused `embed` tag (#34021 by @ClearlyClaire, [GHSA-mq2m-hr29-8gqf](https://github.com/mastodon/mastodon/security/advisories/GHSA-mq2m-hr29-8gqf))
+- Fix rate-limit on sign-up email verification ([GHSA-v39f-c9jj-8w7h](https://github.com/mastodon/mastodon/security/advisories/GHSA-v39f-c9jj-8w7h))
+- Fix improper disclosure of domain blocks to unverified users ([GHSA-94h4-fj37-c825](https://github.com/mastodon/mastodon/security/advisories/GHSA-94h4-fj37-c825))
+
+### Changed
+
+- Change preview cards to be shown when Content Warnings are expanded (#33827 by @ClearlyClaire)
+- Change warnings against changing encryption secrets to be even more noticeable (#33631 by @ClearlyClaire)
+- Change `mastodon:setup` to prevent overwriting already-configured servers (#33603, #33616, and #33684 by @ClearlyClaire and @mjankowski)
+- Change notifications from moderators to not be filtered (#32974 and #33654 by @ClearlyClaire and @mjankowski)
+
+### Fixed
+
+- Fix `GET /api/v2/notifications/:id` and `POST /api/v2/notifications/:id/dismiss` for ungrouped notifications (#33990 by @ClearlyClaire)
+- Fix issue with some versions of libvips on some systems (#33853 by @kleisauke)
+- Fix handling of duplicate mentions in incoming status `Update` (#33911 by @ClearlyClaire)
+- Fix inefficiencies in timeline generation (#33839 and #33842 by @ClearlyClaire)
+- Fix emoji rewrite adding unnecessary curft to the DOM for most emoji (#33818 by @ClearlyClaire)
+- Fix `tootctl feeds build` not building list timelines (#33783 by @ClearlyClaire)
+- Fix flaky test in `/api/v2/notifications` tests (#33773 by @ClearlyClaire)
+- Fix incorrect signature after HTTP redirect (#33757 and #33769 by @ClearlyClaire)
+- Fix polls not being validated on edition (#33755 by @ClearlyClaire)
+- Fix media preview height in compose form when 3 or more images are attached (#33571 by @ClearlyClaire)
+- Fix preview card sizing in “Author attribution” in profile settings (#33482 by @ClearlyClaire)
+- Fix processing of incoming notifications for unfilterable types (#33429 by @ClearlyClaire)
+- Fix featured tags for remote accounts not being kept up to date (#33372, #33406, and #33425 by @ClearlyClaire and @mjankowski)
+- Fix notification polling showing a loading bar in web UI (#32960 by @Gargron)
+- Fix accounts table long display name (#29316 by @WebCoder49)
+- Fix exclusive lists interfering with notifications (#28162 by @ShadowJonathan)
+
+## [4.3.3] - 2025-01-16
+
+### Security
+
+- Fix insufficient validation of account URIs ([GHSA-5wxh-3p65-r4g6](https://github.com/mastodon/mastodon/security/advisories/GHSA-5wxh-3p65-r4g6))
+- Update dependencies
+
+### Fixed
+
+- Fix `libyaml` missing from `Dockerfile` build stage (#33591 by @vmstan)
+- Fix incorrect notification settings migration for non-followers (#33348 by @ClearlyClaire)
+- Fix down clause for notification policy v2 migrations (#33340 by @jesseplusplus)
+- Fix error decrementing status count when `FeaturedTags#last_status_at` is `nil` (#33320 by @ClearlyClaire)
+- Fix last paginated notification group only including data on a single notification (#33271 by @ClearlyClaire)
+- Fix processing of mentions for post edits with an existing corresponding silent mention (#33227 by @ClearlyClaire)
+- Fix deletion of unconfirmed users with Webauthn set (#33186 by @ClearlyClaire)
+- Fix empty authors preview card serialization (#33151, #33466 by @mjankowski and @ClearlyClaire)
+
+## [4.3.2] - 2024-12-03
+
+### Added
+
+- Add `tootctl feeds vacuum` (#33065 by @ClearlyClaire)
+- Add error message when user tries to follow their own account (#31910 by @lenikadali)
+- Add client_secret_expires_at to OAuth Applications (#30317 by @ThisIsMissEm)
+
+### Changed
+
+- Change design of Content Warnings and filters (#32543 by @ClearlyClaire)
+
+### Fixed
+
+- Fix processing incoming post edits with mentions to unresolvable accounts (#33129 by @ClearlyClaire)
+- Fix error when including multiple instances of `embed.js` (#33107 by @YKWeyer)
+- Fix inactive users' timelines being backfilled on follow and unsuspend (#33094 by @ClearlyClaire)
+- Fix direct inbox delivery pushing posts into inactive followers' timelines (#33067 by @ClearlyClaire)
+- Fix `TagFollow` records not being correctly handled in account operations (#33063 by @ClearlyClaire)
+- Fix pushing hashtag-followed posts to feeds of inactive users (#33018 by @Gargron)
+- Fix duplicate notifications in notification groups when using slow mode (#33014 by @ClearlyClaire)
+- Fix posts made in the future being allowed to trend (#32996 by @ClearlyClaire)
+- Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911 by @ClearlyClaire)
+- Fix domain attribution field having autocorrect and autocapitalize enabled (#32903 by @ClearlyClaire)
+- Fix titles being escaped twice (#32889 by @ClearlyClaire)
+- Fix list creation limit check (#32869 by @ClearlyClaire)
+- Fix error in `tootctl email_domain_blocks` when supplying `--with-dns-records` (#32863 by @mjankowski)
+- Fix `min_id` and `max_id` causing error in search API (#32857 by @Gargron)
+- Fix inefficiencies when processing removal of posts that use featured tags (#32787 by @ClearlyClaire)
+- Fix alt-text pop-in not using the translated description (#32766 by @ClearlyClaire)
+- Fix preview cards with long titles erroneously causing layout changes (#32678 by @ClearlyClaire)
+- Fix embed modal layout on mobile (#32641 by @DismalShadowX)
+- Fix and improve batch attachment deletion handling when using OpenStack Swift (#32637 by @hugogameiro)
+- Fix blocks not being applied on link timeline (#32625 by @tribela)
+- Fix follow counters being incorrectly changed (#32622 by @oneiros)
+- Fix 'unknown' media attachment type rendering (#32613 and #32713 by @ThisIsMissEm and @renatolond)
+- Fix tl language native name (#32606 by @seav)
+
+### Security
+
+- Update dependencies
+
+## [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 +220,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 +237,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.\
@@ -51,7 +260,7 @@ The following changelog entries focus on changes visible to users, administrator
 - **Add notifications of severed relationships** (#27511, #29665, #29668, #29670, #29700, #29714, #29712, and #29731 by @ClearlyClaire and @Gargron)\
   Notify local users when they lose relationships as a result of a local moderator blocking a remote account or server, allowing the affected user to retrieve the list of broken relationships.\
   Note that this does not notify remote users.\
-  This adds the `severed_relationships` notification type to the REST API and streaming, with a new [`relationship_severance_event` attribute](https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event).
+  This adds the `severed_relationships` notification type to the REST API and streaming, with a new [`event` attribute](https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event).
 - **Add hover cards in web UI** (#30754, #30864, #30850, #30879, #30928, #30949, #30948, #30931, and #31300 by @ClearlyClaire, @Gargron, and @renchap)\
   Hovering over an avatar or username will now display a hover card with the first two lines of the user's description and their first two profile fields.\
   This can be disabled in the “Animations and accessibility” section of the preferences.
@@ -61,13 +270,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 +359,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 +379,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 +403,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 +495,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 +521,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 +536,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)

Dockerfile

@@ -92,6 +92,9 @@ RUN \
 # Set /opt/mastodon as working directory
 WORKDIR /opt/mastodon
 
+# Add backport repository for some specific packages where we need the latest version
+RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list
+
 # hadolint ignore=DL3008,DL3005
 RUN \
 # Mount Apt cache and lib directories from Docker buildx caches
@@ -150,6 +153,7 @@ RUN \
     libpq-dev \
     libssl-dev \
     libtool \
+    libyaml-dev \
     meson \
     nasm \
     pkg-config \
@@ -160,7 +164,7 @@ RUN \
     libexif-dev \
     libexpat1-dev \
     libgirepository1.0-dev \
-    libheif-dev \
+    libheif-dev/bookworm-backports \
     libimagequant-dev \
     libjpeg62-turbo-dev \
     liblcms2-dev \
@@ -343,7 +347,7 @@ RUN \
   # libvips components
     libcgif0 \
     libexif12 \
-    libheif1 \
+    libheif1/bookworm-backports \
     libimagequant0 \
     libjpeg62-turbo \
     liblcms2-2 \

Gemfile.lock

@@ -10,35 +10,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.4)
+    actioncable (7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.4)
+    actionmailbox (7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.5.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.4)
+    actionmailer (7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.5.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.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.5.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.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.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.4)
+    actionview (7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -64,30 +64,33 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (7.1.4)
+    activejob (7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.1.4)
+    activemodel (7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
-    activerecord (7.1.4)
+    activerecord (7.1.5.1)
-      activemodel (= 7.1.4)
+      activemodel (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       timeout (>= 0.4.0)
-    activestorage (7.1.4)
+    activestorage (7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.5.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       marcel (~> 1.0)
-    activesupport (7.1.4)
+    activesupport (7.1.5.1)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
       mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -126,6 +129,7 @@ GEM
     base64 (0.2.0)
     bcp47_spec (0.2.1)
     bcrypt (3.1.20)
+    benchmark (0.4.0)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -186,7 +190,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.4)
+    date (3.4.1)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -262,15 +266,15 @@ GEM
       faraday (~> 1.0)
     fast_blank (1.0.1)
     fastimage (2.3.1)
-    ffi (1.16.3)
+    ffi (1.17.1)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    flatware (2.3.3)
+    flatware (2.3.4)
       drb
       thor (< 2.0)
-    flatware-rspec (2.3.3)
+    flatware-rspec (2.3.4)
-      flatware (= 2.3.3)
+      flatware (= 2.3.4)
       rspec (>= 3.6)
     fog-core (2.5.0)
       builder
@@ -406,7 +410,7 @@ GEM
     llhttp-ffi (0.5.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    logger (1.6.1)
+    logger (1.6.6)
     lograge (0.14.0)
       actionpack (>= 4)
       activesupport (>= 4)
@@ -433,7 +437,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0820)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -443,7 +447,7 @@ GEM
       uri
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
-    net-imap (0.4.15)
+    net-imap (0.5.8)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -451,16 +455,16 @@ GEM
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.7)
+    nokogiri (1.18.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.6)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.2)
+    omniauth (2.1.3)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -471,9 +475,9 @@ GEM
     omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
-    omniauth-saml (2.2.1)
+    omniauth-saml (2.2.3)
       omniauth (~> 2.1)
-      ruby-saml (~> 1.17)
+      ruby-saml (~> 1.18)
     omniauth_openid_connect (0.6.1)
       omniauth (>= 1.9, < 3)
       openid_connect (~> 1.1)
@@ -601,7 +605,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
@@ -615,7 +619,7 @@ GEM
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.9)
+    rack (2.2.13)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -638,20 +642,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.4)
+    rails (7.1.5.1)
-      actioncable (= 7.1.4)
+      actioncable (= 7.1.5.1)
-      actionmailbox (= 7.1.4)
+      actionmailbox (= 7.1.5.1)
-      actionmailer (= 7.1.4)
+      actionmailer (= 7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      actiontext (= 7.1.4)
+      actiontext (= 7.1.5.1)
-      actionview (= 7.1.4)
+      actionview (= 7.1.5.1)
-      activejob (= 7.1.4)
+      activejob (= 7.1.5.1)
-      activemodel (= 7.1.4)
+      activemodel (= 7.1.5.1)
-      activerecord (= 7.1.4)
+      activerecord (= 7.1.5.1)
-      activestorage (= 7.1.4)
+      activestorage (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.1.4)
+      railties (= 7.1.5.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -660,15 +664,15 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.4)
+    railties (7.1.5.1)
-      actionpack (= 7.1.4)
+      actionpack (= 7.1.5.1)
-      activesupport (= 7.1.4)
+      activesupport (= 7.1.5.1)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -698,7 +702,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.7)
+    rexml (3.3.9)
     rotp (6.3.0)
     rouge (4.3.0)
     rpam2 (4.0.2)
@@ -748,25 +752,25 @@ 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)
       rubocop-rspec (~> 3, >= 3.0.1)
     ruby-prof (1.7.0)
     ruby-progressbar (1.13.0)
-    ruby-saml (1.17.0)
+    ruby-saml (1.18.0)
       nokogiri (>= 1.13.10)
       rexml
-    ruby-vips (2.2.2)
+    ruby-vips (2.2.3)
       ffi (~> 1.12)
       logger
     ruby2_keywords (0.0.5)
@@ -781,6 +785,7 @@ GEM
     scenic (1.8.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
+    securerandom (0.4.1)
     selenium-webdriver (4.25.0)
       base64 (~> 0.2)
       logger (~> 1.4)
@@ -837,7 +842,7 @@ GEM
     test-prof (1.4.2)
     thor (1.3.2)
     tilt (2.4.0)
-    timeout (0.4.1)
+    timeout (0.4.3)
     tpm-key_attestation (0.12.1)
       bindata (~> 2.4)
       openssl (> 2.0)
@@ -863,7 +868,7 @@ GEM
       unf_ext
     unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
-    uri (0.13.1)
+    uri (0.13.2)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
@@ -884,7 +889,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)
@@ -1060,4 +1065,4 @@ RUBY VERSION
    ruby 3.3.4p94
 
 BUNDLED WITH
-   2.5.18
+   2.6.5

app/controllers/admin/announcements_controller.rb

@@ -6,6 +6,7 @@ class Admin::AnnouncementsController < Admin::BaseController
 
   def index
     authorize :announcement, :index?
+    @published_announcements_count = Announcement.published.async_count
   end
 
   def new

app/controllers/admin/disputes/appeals_controller.rb

@@ -6,6 +6,7 @@ class Admin::Disputes::AppealsController < Admin::BaseController
   def index
     authorize :appeal, :index?
 
+    @pending_appeals_count = Appeal.pending.async_count
     @appeals = filtered_appeals.page(params[:page])
   end
 

app/controllers/admin/trends/links/preview_card_providers_controller.rb

@@ -4,6 +4,7 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll
   def index
     authorize :preview_card_provider, :review?
 
+    @pending_preview_card_providers_count = PreviewCardProvider.unreviewed.async_count
     @preview_card_providers = filtered_preview_card_providers.page(params[:page])
     @form = Trends::PreviewCardProviderBatch.new
   end

app/controllers/admin/trends/tags_controller.rb

@@ -4,6 +4,7 @@ class Admin::Trends::TagsController < Admin::BaseController
   def index
     authorize :tag, :review?
 
+    @pending_tags_count = Tag.pending_review.async_count
     @tags = filtered_tags.page(params[:page])
     @form = Trends::TagBatch.new
   end

app/controllers/api/base_controller.rb

@@ -72,6 +72,13 @@ class Api::BaseController < ApplicationController
     end
   end
 
+  # Redefine `require_functional!` to properly output JSON instead of HTML redirects
+  def require_functional!
+    return if current_user.functional?
+
+    require_user!
+  end
+
   def render_empty
     render json: {}, status: 200
   end

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

@@ -14,7 +14,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
     @account = current_account
     UpdateAccountService.new.call(@account, account_params, raise_error: true)
     current_user.update(user_params) if user_params
-    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
     render json: @account, serializer: REST::CredentialAccountSerializer
   rescue ActiveRecord::RecordInvalid => e
     render json: ValidationErrorFormatter.new(e).as_json, status: 422

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/accounts_controller.rb

@@ -16,6 +16,7 @@ class Api::V1::AccountsController < Api::BaseController
   before_action :check_account_confirmation, except: [:index, :create]
   before_action :check_enabled_registrations, only: [:create]
   before_action :check_accounts_limit, only: [:index]
+  before_action :check_following_self, only: [:follow]
 
   skip_before_action :require_authenticated_user!, only: :create
 
@@ -106,6 +107,10 @@ class Api::V1::AccountsController < Api::BaseController
     raise(Mastodon::ValidationError) if account_ids.size > DEFAULT_ACCOUNTS_LIMIT
   end
 
+  def check_following_self
+    render json: { error: I18n.t('accounts.self_follow_error') }, status: 403 if current_user.account.id == @account.id
+  end
+
   def relationships(**options)
     AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
   end

app/controllers/api/v1/antennas_controller.rb

@@ -21,7 +21,7 @@ class Api::V1::AntennasController < Api::BaseController
   end
 
   def create
-    @antenna = Antenna.create!(antenna_params.merge(account: current_account, list_id: 0))
+    @antenna = Antenna.create!({ list_id: 0 }.merge(antenna_params.merge(account: current_account)))
     render json: @antenna, serializer: REST::AntennaSerializer
   end
 

app/controllers/api/v1/instances/domain_blocks_controller.rb

@@ -31,7 +31,7 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr
   end
 
   def show_domain_blocks_to_user?
-    Setting.show_domain_blocks == 'users' && user_signed_in?
+    Setting.show_domain_blocks == 'users' && user_signed_in? && current_user.functional_or_moved?
   end
 
   def set_domain_blocks
@@ -47,6 +47,6 @@ class Api::V1::Instances::DomainBlocksController < Api::V1::Instances::BaseContr
   end
 
   def show_rationale_for_user?
-    Setting.show_domain_blocks_rationale == 'users' && user_signed_in?
+    Setting.show_domain_blocks_rationale == 'users' && user_signed_in? && current_user.functional_or_moved?
   end
 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/profile/avatars_controller.rb

@@ -7,7 +7,7 @@ class Api::V1::Profile::AvatarsController < Api::BaseController
   def destroy
     @account = current_account
     UpdateAccountService.new.call(@account, { avatar: nil }, raise_error: true)
-    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
     render json: @account, serializer: REST::CredentialAccountSerializer
   end
 end

app/controllers/api/v1/profile/headers_controller.rb

@@ -7,7 +7,7 @@ class Api::V1::Profile::HeadersController < Api::BaseController
   def destroy
     @account = current_account
     UpdateAccountService.new.call(@account, { header: nil }, raise_error: true)
-    ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+    ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
     render json: @account, serializer: REST::CredentialAccountSerializer
   end
 end

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/api/v2/notifications_controller.rb

@@ -46,7 +46,7 @@ class Api::V2::NotificationsController < Api::BaseController
   end
 
   def show
-    @notification = current_account.notifications.without_suspended.find_by!(group_key: params[:group_key])
+    @notification = current_account.notifications.without_suspended.by_group_key(params[:group_key]).take!
     presenter = GroupedNotificationsPresenter.new(NotificationGroup.from_notifications([@notification]))
     render json: presenter, serializer: REST::DedupNotificationGroupSerializer
   end
@@ -57,7 +57,7 @@ class Api::V2::NotificationsController < Api::BaseController
   end
 
   def dismiss
-    current_account.notifications.where(group_key: params[:group_key]).destroy_all
+    current_account.notifications.by_group_key(params[:group_key]).destroy_all
     render_empty
   end
 
@@ -80,10 +80,31 @@ class Api::V2::NotificationsController < Api::BaseController
     return [] if @notifications.empty?
 
     MastodonOTELTracer.in_span('Api::V2::NotificationsController#load_grouped_notifications') do
-      NotificationGroup.from_notifications(@notifications, pagination_range: (@notifications.last.id)..(@notifications.first.id), grouped_types: params[:grouped_types])
+      pagination_range = (@notifications.last.id)..@notifications.first.id
+
+      # If the page is incomplete, we know we are on the last page
+      if incomplete_page?
+        if paginating_up?
+          pagination_range = @notifications.last.id...(params[:max_id]&.to_i)
+        else
+          range_start = params[:since_id]&.to_i
+          range_start += 1 unless range_start.nil?
+          pagination_range = range_start..(@notifications.first.id)
+        end
+      end
+
+      NotificationGroup.from_notifications(@notifications, pagination_range: pagination_range, grouped_types: params[:grouped_types])
     end
   end
 
+  def incomplete_page?
+    @notifications.size < limit_param(DEFAULT_NOTIFICATIONS_LIMIT)
+  end
+
+  def paginating_up?
+    params[:min_id].present?
+  end
+
   def browserable_account_notifications
     current_account.notifications.without_suspended.browserable(
       types: Array(browserable_params[:types]),

app/controllers/application_controller.rb

@@ -71,7 +71,23 @@ class ApplicationController < ActionController::Base
   end
 
   def require_functional!
-    redirect_to edit_user_registration_path unless current_user.functional?
+    return if current_user.functional?
+
+    respond_to do |format|
+      format.any do
+        redirect_to edit_user_registration_path
+      end
+
+      format.json do
+        if !current_user.confirmed?
+          render json: { error: 'Your login is missing a confirmed e-mail address' }, status: 403
+        elsif !current_user.approved?
+          render json: { error: 'Your login is currently pending approval' }, status: 403
+        elsif !current_user.functional?
+          render json: { error: 'Your login is currently disabled' }, status: 403
+        end
+      end
+    end
   end
 
   def skip_csrf_meta_tags?

app/controllers/backups_controller.rb

@@ -9,13 +9,15 @@ class BackupsController < ApplicationController
   before_action :authenticate_user!
   before_action :set_backup
 
+  BACKUP_LINK_TIMEOUT = 1.hour.freeze
+
   def download
     case Paperclip::Attachment.default_options[:storage]
     when :s3, :azure
-      redirect_to @backup.dump.expiring_url(10), allow_other_host: true
+      redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.to_i), allow_other_host: true
     when :fog
       if Paperclip::Attachment.default_options.dig(:fog_credentials, :openstack_temp_url_key).present?
-        redirect_to @backup.dump.expiring_url(Time.now.utc + 10), allow_other_host: true
+        redirect_to @backup.dump.expiring_url(BACKUP_LINK_TIMEOUT.from_now), allow_other_host: true
       else
         redirect_to full_asset_url(@backup.dump.url), allow_other_host: true
       end

app/controllers/concerns/signature_verification.rb

@@ -117,7 +117,7 @@ module SignatureVerification
 
   def verify_signature_strength!
     raise SignatureVerificationError, 'Mastodon requires the Date header or (created) pseudo-header to be signed' unless signed_headers.include?('date') || signed_headers.include?('(created)')
-    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(Request::REQUEST_TARGET) || signed_headers.include?('digest')
+    raise SignatureVerificationError, 'Mastodon requires the Digest header or (request-target) pseudo-header to be signed' unless signed_headers.include?(HttpSignatureDraft::REQUEST_TARGET) || signed_headers.include?('digest')
     raise SignatureVerificationError, 'Mastodon requires the Host header to be signed when doing a GET request' if request.get? && !signed_headers.include?('host')
     raise SignatureVerificationError, 'Mastodon requires the Digest header to be signed when doing a POST request' if request.post? && !signed_headers.include?('digest')
   end
@@ -155,14 +155,14 @@ module SignatureVerification
   def build_signed_string(include_query_string: true)
     signed_headers.map do |signed_header|
       case signed_header
-      when Request::REQUEST_TARGET
+      when HttpSignatureDraft::REQUEST_TARGET
         if include_query_string
-          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}"
+          "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.original_fullpath}"
         else
           # Current versions of Mastodon incorrectly omit the query string from the (request-target) pseudo-header.
           # Therefore, temporarily support such incorrect signatures for compatibility.
           # TODO: remove eventually some time after release of the fixed version
-          "#{Request::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
+          "#{HttpSignatureDraft::REQUEST_TARGET}: #{request.method.downcase} #{request.path}"
         end
       when '(created)'
         raise SignatureVerificationError, 'Invalid pseudo-header (created) for rsa-sha256' unless signature_algorithm == 'hs2019'

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/pictures_controller.rb

@@ -8,7 +8,7 @@ module Settings
     def destroy
       if valid_picture?
         if UpdateAccountService.new.call(@account, { @picture => nil, "#{@picture}_remote_url" => '' })
-          ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+          ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
           redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg'), status: 303
         else
           redirect_to settings_profile_path

app/controllers/settings/privacy_controller.rb

@@ -8,7 +8,7 @@ class Settings::PrivacyController < Settings::BaseController
   def update
     if UpdateAccountService.new.call(@account, account_params.except(:settings))
       current_user.update!(settings_attributes: account_params[:settings])
-      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
       redirect_to settings_privacy_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show

app/controllers/settings/privacy_extra_controller.rb

@@ -8,7 +8,7 @@ class Settings::PrivacyExtraController < Settings::BaseController
   def update
     if UpdateAccountService.new.call(@account, account_params.except(:settings))
       current_user.update!(settings_attributes: account_params[:settings])
-      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
       redirect_to settings_privacy_extra_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show

app/controllers/settings/profiles_controller.rb

@@ -9,7 +9,7 @@ class Settings::ProfilesController < Settings::BaseController
 
   def update
     if UpdateAccountService.new.call(@account, account_params)
-      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
       redirect_to settings_profile_path, notice: I18n.t('generic.changes_saved_msg')
     else
       @account.build_fields

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/settings/verifications_controller.rb

@@ -8,7 +8,7 @@ class Settings::VerificationsController < Settings::BaseController
 
   def update
     if UpdateAccountService.new.call(@account, account_params)
-      ActivityPub::UpdateDistributionWorker.perform_async(@account.id)
+      ActivityPub::UpdateDistributionWorker.perform_in(ActivityPub::UpdateDistributionWorker::DEBOUNCE_DELAY, @account.id)
       redirect_to settings_verification_path, notice: I18n.t('generic.changes_saved_msg')
     else
       render :show

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/admin/trends/statuses_helper.rb

@@ -2,11 +2,18 @@
 
 module Admin::Trends::StatusesHelper
   def one_line_preview(status)
-    text = if status.local?
+    text = begin
-             status.text.split("\n").first
+      if status.local?
-           else
+        status.text.split("\n").first
-             Nokogiri::HTML5(status.text).css('html > body > *').first&.text
+      else
-           end
+        Nokogiri::HTML5(status.text).css('html > body > *').first&.text
+      end
+    rescue ArgumentError
+      # This can happen if one of the Nokogumbo limits is encountered
+      # Unfortunately, it does not use a more precise error class
+      # nor allows more graceful handling
+      ''
+    end
 
     return '' if text.blank?
 

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
@@ -87,7 +81,7 @@ module ApplicationHelper
 
   def html_title
     safe_join(
-      [content_for(:page_title).to_s.chomp, title]
+      [content_for(:page_title), title]
       .compact_blank,
       ' - '
     )
@@ -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/context_helper.rb

@@ -34,6 +34,13 @@ module ContextHelper
     license: { 'schema' => 'http://schema.org#', 'license' => 'schema:license' },
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
     attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
+    interaction_policies: {
+      'gts' => 'https://gotosocial.org/ns#',
+      'interactionPolicy' => { '@id' => 'gts:interactionPolicy', '@type' => '@id' },
+      'canQuote' => { '@id' => 'gts:canQuote', '@type' => '@id' },
+      'automaticApproval' => { '@id' => 'gts:automaticApproval', '@type' => '@id' },
+      'manualApproval' => { '@id' => 'gts:manualApproval', '@type' => '@id' },
+    },
   }.freeze
 
   def full_context

app/helpers/languages_helper.rb

@@ -162,7 +162,7 @@ module LanguagesHelper
     th: ['Thai', 'ไทย'].freeze,
     ti: ['Tigrinya', 'ትግርኛ'].freeze,
     tk: ['Turkmen', 'Türkmen'].freeze,
-    tl: ['Tagalog', 'Wikang Tagalog'].freeze,
+    tl: ['Tagalog', 'Tagalog'].freeze,
     tn: ['Tswana', 'Setswana'].freeze,
     to: ['Tonga', 'faka Tonga'].freeze,
     tr: ['Turkish', 'Türkçe'].freeze,

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/entrypoints/sign_up.ts

@@ -4,9 +4,12 @@ import axios from 'axios';
 import ready from '../mastodon/ready';
 
 async function checkConfirmation() {
-  const response = await axios.get('/api/v1/emails/check_confirmation');
+  const response = await axios.get('/api/v1/emails/check_confirmation', {
+    headers: { Accept: 'application/json' },
+    withCredentials: true,
+  });
 
-  if (response.data) {
+  if (response.status === 200 && response.data === true) {
     window.location.href = '/start';
   }
 }

app/javascript/mastodon/actions/importer/normalizer.js

@@ -97,6 +97,17 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.contentHtml  = emojify(normalStatus.content, emojiMap);
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
     normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
+
+    if (normalStatus.url && !(normalStatus.url.startsWith('http://') || normalStatus.url.startsWith('https://'))) {
+      normalStatus.url = null;
+    }
+
+    normalStatus.url ||= normalStatus.uri;
+
+    normalStatus.media_attachments.forEach(item => {
+      if (item.remote_url && !(item.remote_url.startsWith('http://') || item.remote_url.startsWith('https://')))
+        item.remote_url = null;
+    });
   }
 
   if (normalOldStatus) {

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
@@ -137,6 +141,9 @@ export const pollRecentNotifications = createDataLoadingThunk(
 
     return { notifications };
   },
+  {
+    useLoadingBar: false,
+  },
 );
 
 export const processNewNotificationForGroups = createAppAsyncThunk(
@@ -148,7 +155,7 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
     const showInColumn =
       activeFilter === 'all'
-        ? notificationShows[notification.type]
+        ? notificationShows[notification.type] !== false
         : activeFilter === notification.type;
 
     if (!showInColumn) return;
@@ -168,7 +175,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/content_warning.tsx

@@ -8,7 +8,7 @@ export const ContentWarning: React.FC<{
   <StatusBanner
     expanded={expanded}
     onClick={onClick}
-    variant={BannerVariant.Yellow}
+    variant={BannerVariant.Warning}
   >
     <p dangerouslySetInnerHTML={{ __html: text }} />
   </StatusBanner>

app/javascript/mastodon/components/filter_warning.tsx

@@ -10,13 +10,16 @@ export const FilterWarning: React.FC<{
   <StatusBanner
     expanded={expanded}
     onClick={onClick}
-    variant={BannerVariant.Blue}
+    variant={BannerVariant.Filter}
   >
     <p>
       <FormattedMessage
         id='filter_warning.matches_filter'
-        defaultMessage='Matches filter “{title}”'
+        defaultMessage='Matches filter “<span>{title}</span>”'
-        values={{ title }}
+        values={{
+          title,
+          span: (chunks) => <span className='filter-name'>{chunks}</span>,
+        }}
       />
     </p>
   </StatusBanner>

app/javascript/mastodon/components/media_gallery.jsx

@@ -113,12 +113,12 @@ class Item extends PureComponent {
       width = 25;
     }
 
-    if (attachment.get('description')?.length > 0) {
-      badges.push(<AltTextBadge key='alt' description={attachment.get('description')} />);
-    }
-
     const description = attachment.getIn(['translation', 'description']) || attachment.get('description');
 
+    if (description?.length > 0) {
+      badges.push(<AltTextBadge key='alt' description={description} />);
+    }
+
     if (attachment.get('type') === 'unknown') {
       return (
         <div className={classNames('media-gallery__item', { standalone, 'media-gallery__item--tall': height === 100, 'media-gallery__item--wide': width === 100 })} key={attachment.get('id')}>
@@ -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.jsx

@@ -340,7 +340,7 @@ class Status extends ImmutablePureComponent {
     const { onToggleHidden } = this.props;
     const status = this._properStatus();
 
-    if (status.get('matched_filters')) {
+    if (this.props.status.get('matched_filters')) {
       const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
       const expandedBecauseOfFilter = this.state.showDespiteFilter;
 
@@ -477,7 +477,7 @@ class Status extends ImmutablePureComponent {
             media={status.get('media_attachments')}
           />
         );
-      } else if (['image', 'gifv'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
+      } else if (['image', 'gifv', 'unknown'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
         media = (
           <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
             {Component => (

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;
 
@@ -316,14 +313,14 @@ class StatusActionBar extends ImmutablePureComponent {
       if (publicStatus && isRemote) {
         menu.push({ text: intl.formatMessage(messages.openOriginalPage), href: status.get('url') });
       }
-  
+
       menu.push({ text: intl.formatMessage(messages.copy), action: this.handleCopy });
-  
+
       if (publicStatus && 'share' in navigator) {
         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/components/status_banner.tsx

@@ -1,8 +1,8 @@
 import { FormattedMessage } from 'react-intl';
 
 export enum BannerVariant {
-  Yellow = 'yellow',
+  Warning = 'warning',
-  Blue = 'blue',
+  Filter = 'filter',
 }
 
 export const StatusBanner: React.FC<{
@@ -11,9 +11,9 @@ export const StatusBanner: React.FC<{
   expanded?: boolean;
   onClick?: () => void;
 }> = ({ children, variant, expanded, onClick }) => (
-  <div
+  <label
     className={
-      variant === BannerVariant.Yellow
+      variant === BannerVariant.Warning
         ? 'content-warning'
         : 'content-warning content-warning--filter'
     }
@@ -26,6 +26,11 @@ export const StatusBanner: React.FC<{
           id='content_warning.hide'
           defaultMessage='Hide post'
         />
+      ) : variant === BannerVariant.Warning ? (
+        <FormattedMessage
+          id='content_warning.show_more'
+          defaultMessage='Show more'
+        />
       ) : (
         <FormattedMessage
           id='content_warning.show'
@@ -33,5 +38,5 @@ export const StatusBanner: React.FC<{
         />
       )}
     </button>
-  </div>
+  </label>
 );

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/bookmarked_statuses/index.jsx

@@ -101,6 +101,7 @@ class Bookmarks extends ImmutablePureComponent {
           onLoadMore={this.handleLoadMore}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
+          timelineId='bookmarks'
         />
 
         <Helmet>

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/emoji/__tests__/emoji-test.js

@@ -22,23 +22,23 @@ describe('emoji', () => {
 
     it('does unicode', () => {
       expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="👩‍👩‍👦‍👦" title=":woman-woman-boy-boy:" src="/emoji/1f469-200d-1f469-200d-1f466-200d-1f466.svg">');
       expect(emojify('👨‍👩‍👧‍👧')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="👨‍👩‍👧‍👧" title=":man-woman-girl-girl:" src="/emoji/1f468-200d-1f469-200d-1f467-200d-1f467.svg">');
-      expect(emojify('👩‍👩‍👦')).toEqual('<picture><img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg"></picture>');
+      expect(emojify('👩‍👩‍👦')).toEqual('<img draggable="false" class="emojione" alt="👩‍👩‍👦" title=":woman-woman-boy:" src="/emoji/1f469-200d-1f469-200d-1f466.svg">');
       expect(emojify('\u2757')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
     });
 
     it('does multiple unicode', () => {
       expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
       expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture><picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg">');
       expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
-        '<picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture>');
+        '<img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg">');
       expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
-        'foo <picture><img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"></picture> <picture><img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"></picture> bar');
+        'foo <img draggable="false" class="emojione" alt="❗" title=":exclamation:" src="/emoji/2757.svg"> <img draggable="false" class="emojione" alt="#️⃣" title=":hash:" src="/emoji/23-20e3.svg"> bar');
     });
 
     it('ignores unicode inside of tags', () => {
@@ -46,16 +46,16 @@ describe('emoji', () => {
     });
 
     it('does multiple emoji properly (issue 5188)', () => {
-      expect(emojify('👌🌈💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture><picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
+      expect(emojify('👌🌈💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
-      expect(emojify('👌 🌈 💕')).toEqual('<picture><img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"></picture> <picture><img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"></picture> <picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture>');
+      expect(emojify('👌 🌈 💕')).toEqual('<img draggable="false" class="emojione" alt="👌" title=":ok_hand:" src="/emoji/1f44c.svg"> <img draggable="false" class="emojione" alt="🌈" title=":rainbow:" src="/emoji/1f308.svg"> <img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg">');
     });
 
     it('does an emoji that has no shortcode', () => {
-      expect(emojify('👁‍🗨')).toEqual('<picture><img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg"></picture>');
+      expect(emojify('👁‍🗨')).toEqual('<img draggable="false" class="emojione" alt="👁‍🗨" title="" src="/emoji/1f441-200d-1f5e8.svg">');
     });
 
     it('does an emoji whose filename is irregular', () => {
-      expect(emojify('↙️')).toEqual('<picture><img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg"></picture>');
+      expect(emojify('↙️')).toEqual('<img draggable="false" class="emojione" alt="↙️" title=":arrow_lower_left:" src="/emoji/2199.svg">');
     });
 
     it('avoid emojifying on invisible text', () => {
@@ -67,11 +67,11 @@ describe('emoji', () => {
 
     it('avoid emojifying on invisible text with nested tags', () => {
       expect(emojify('<span class="invisible">😄<span class="foo">bar</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<span class="foo">bar</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
       expect(emojify('<span class="invisible">😄<span class="invisible">😕</span>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<span class="invisible">😕</span>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
       expect(emojify('<span class="invisible">😄<br>😴</span>😇'))
-        .toEqual('<span class="invisible">😄<br>😴</span><picture><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg"></picture>');
+        .toEqual('<span class="invisible">😄<br>😴</span><img draggable="false" class="emojione" alt="😇" title=":innocent:" src="/emoji/1f607.svg">');
     });
 
     it('does not emojify emojis with textual presentation VS15 character', () => {
@@ -81,17 +81,17 @@ describe('emoji', () => {
 
     it('does a simple emoji properly', () => {
       expect(emojify('♀♂'))
-        .toEqual('<picture><img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"></picture><picture><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg"></picture>');
+        .toEqual('<img draggable="false" class="emojione" alt="♀" title=":female_sign:" src="/emoji/2640.svg"><img draggable="false" class="emojione" alt="♂" title=":male_sign:" src="/emoji/2642.svg">');
     });
 
     it('does an emoji containing ZWJ properly', () => {
       expect(emojify('💂‍♀️💂‍♂️'))
-        .toEqual('<picture><img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"></picture><picture><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg"></picture>');
+        .toEqual('<img draggable="false" class="emojione" alt="💂\u200D♀️" title=":female-guard:" src="/emoji/1f482-200d-2640-fe0f_border.svg"><img draggable="false" class="emojione" alt="💂\u200D♂️" title=":male-guard:" src="/emoji/1f482-200d-2642-fe0f_border.svg">');
     });
 
     it('keeps ordering as expected (issue fixed by PR 20677)', () => {
-      expect(emojify('<p>💕 <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>'))
+      expect(emojify('<p>💕 <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener" target="_blank">#<span>foo</span></a> test: foo.</p>'))
-        .toEqual('<p><picture><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"></picture> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener noreferrer" target="_blank">#<span>foo</span></a> test: foo.</p>');
+        .toEqual('<p><img draggable="false" class="emojione" alt="💕" title=":two_hearts:" src="/emoji/1f495.svg"> <a class="hashtag" href="https://example.com/tags/foo" rel="nofollow noopener" target="_blank">#<span>foo</span></a> test: foo.</p>');
     });
   });
 });

app/javascript/mastodon/features/emoji/emoji.js

@@ -97,30 +97,30 @@ const emojifyTextNode = (node, customEmojis) => {
       const { filename, shortCode } = unicodeMapping[unicode_emoji];
       const title = shortCode ? `:${shortCode}:` : '';
 
-      replacement = document.createElement('picture');
-
       const isSystemTheme = !!document.body?.classList.contains('theme-system');
 
-      if(isSystemTheme) {
+      const theme = (isSystemTheme || document.body?.classList.contains('theme-mastodon-light')) ? 'light' : 'dark';
-        let source = document.createElement('source');
-        source.setAttribute('media', '(prefers-color-scheme: dark)');
-        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, "dark")}.svg`);
-        replacement.appendChild(source);
-      }
 
-      let img = document.createElement('img');
+      const imageFilename = emojiFilename(filename, theme);
+
+      const img = document.createElement('img');
       img.setAttribute('draggable', 'false');
       img.setAttribute('class', 'emojione');
       img.setAttribute('alt', unicode_emoji);
       img.setAttribute('title', title);
+      img.setAttribute('src', `${assetHost}/emoji/${imageFilename}.svg`);
 
-      let theme = "light";
+      if (isSystemTheme && imageFilename !== emojiFilename(filename, 'dark')) {
+        replacement = document.createElement('picture');
 
-      if(!isSystemTheme && !document.body?.classList.contains('theme-mastodon-light'))
+        const source = document.createElement('source');
-        theme = "dark";
+        source.setAttribute('media', '(prefers-color-scheme: dark)');
-
+        source.setAttribute('srcset', `${assetHost}/emoji/${emojiFilename(filename, 'dark')}.svg`);
-      img.setAttribute('src', `${assetHost}/emoji/${emojiFilename(filename, theme)}.svg`);
+        replacement.appendChild(source);
-      replacement.appendChild(img);
+        replacement.appendChild(img);
+      } else {
+        replacement = img;
+      }
     }
 
     // Add the processed-up-to-now string and the emoji replacement
@@ -135,7 +135,7 @@ const emojifyTextNode = (node, customEmojis) => {
 };
 
 const emojifyNode = (node, customEmojis) => {
-  for (const child of node.childNodes) {
+  for (const child of Array.from(node.childNodes)) {
     switch(child.nodeType) {
     case Node.TEXT_NODE:
       emojifyTextNode(child, customEmojis);

app/javascript/mastodon/features/favourited_statuses/index.jsx

@@ -101,6 +101,7 @@ class Favourites extends ImmutablePureComponent {
           onLoadMore={this.handleLoadMore}
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
+          timelineId='favourites'
         />
 
         <Helmet>

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/status/components/detailed_status.tsx

@@ -15,6 +15,7 @@ import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?re
 import { AnimatedNumber } from 'mastodon/components/animated_number';
 import { ContentWarning } from 'mastodon/components/content_warning';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
+import { FilterWarning } from 'mastodon/components/filter_warning';
 import type { StatusLike } from 'mastodon/components/hashtag_bar';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon } from 'mastodon/components/icon';
@@ -78,6 +79,7 @@ export const DetailedStatus: React.FC<{
 }) => {
   const properStatus = status?.get('reblog') ?? status;
   const [height, setHeight] = useState(0);
+  const [showDespiteFilter, setShowDespiteFilter] = useState(false);
   const nodeRef = useRef<HTMLDivElement>();
 
   const handleOpenVideo = useCallback(
@@ -90,6 +92,10 @@ export const DetailedStatus: React.FC<{
     [onOpenVideo, status],
   );
 
+  const handleFilterToggle = useCallback(() => {
+    setShowDespiteFilter(!showDespiteFilter);
+  }, [showDespiteFilter, setShowDespiteFilter]);
+
   const handleExpandedToggle = useCallback(() => {
     if (onToggleHidden) onToggleHidden(status);
   }, [onToggleHidden, status]);
@@ -163,7 +169,7 @@ export const DetailedStatus: React.FC<{
     media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
   } else if (status.get('media_attachments').size > 0) {
     if (
-      ['image', 'gifv'].includes(
+      ['image', 'gifv', 'unknown'].includes(
         status.getIn(['media_attachments', 0, 'type']) as string,
       ) ||
       status.get('media_attachments').size > 1
@@ -235,7 +241,7 @@ export const DetailedStatus: React.FC<{
       <Card
         sensitive={status.get('sensitive') && !status.get('spoiler_text')}
         onOpenMedia={onOpenMedia}
-        card={status.get('card', null)}
+        card={status.get('card')}
       />
     );
   }
@@ -367,8 +373,12 @@ export const DetailedStatus: React.FC<{
   const { statusContentProps, hashtagBar } = getHashtagBarForStatus(
     status as StatusLike,
   );
+
+  const matchedFilters = status.get('matched_filters');
+
   const expanded =
-    !status.get('hidden') || status.get('spoiler_text').length === 0;
+    (!matchedFilters || showDespiteFilter) &&
+    (!status.get('hidden') || status.get('spoiler_text').length === 0);
 
   const quote = !muted && status.get('quote_id') && (
     <>
@@ -412,17 +422,26 @@ export const DetailedStatus: React.FC<{
           )}
         </Link>
 
-        {status.get('spoiler_text').length > 0 && (
+        {matchedFilters && (
-          <ContentWarning
+          <FilterWarning
-            text={
+            title={matchedFilters.join(', ')}
-              status.getIn(['translation', 'spoilerHtml']) ||
+            expanded={showDespiteFilter}
-              status.get('spoilerHtml')
+            onClick={handleFilterToggle}
-            }
-            expanded={expanded}
-            onClick={handleExpandedToggle}
           />
         )}
 
+        {status.get('spoiler_text').length > 0 &&
+          (!matchedFilters || showDespiteFilter) && (
+            <ContentWarning
+              text={
+                status.getIn(['translation', 'spoilerHtml']) ||
+                status.get('spoilerHtml')
+              }
+              expanded={expanded}
+              onClick={handleExpandedToggle}
+            />
+          )}
+
         {expanded && (
           <>
             <StatusContent

app/javascript/mastodon/features/status/index.jsx

@@ -147,7 +147,7 @@ const makeMapStateToProps = () => {
   });
 
   const mapStateToProps = (state, props) => {
-    const status = getStatus(state, { id: props.params.statusId });
+    const status = getStatus(state, { id: props.params.statusId, contextType: 'detailed' });
 
     let ancestorsIds   = Immutable.List();
     let descendantsIds = Immutable.List();

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": "إخفاء المقطع الصوتي",
@@ -195,6 +196,7 @@
   "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
   "content_warning.hide": "إخفاء المنشور",
   "content_warning.show": "إظهار على أي حال",
+  "content_warning.show_more": "إظهار المزيد",
   "conversation.delete": "احذف المحادثة",
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
@@ -301,7 +303,6 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
-  "filter_warning.matches_filter": "يطابق عامل التصفية \"{title}\"",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
@@ -490,6 +491,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": "تم حذف بعض من منشوراتك.",
@@ -758,7 +760,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

@@ -4,32 +4,38 @@
   "about.disclaimer": "Mastodon ye software gratuito y de códigu llibre, y una marca rexistrada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "El motivu nun ta disponible",
   "about.domain_blocks.preamble": "Polo xeneral, Mastodon permítete ver el conteníu ya interactuar colos perfiles d'otros sirvidores nel fediversu. Estes son les esceiciones que se ficieron nesti sirvidor.",
-  "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles ya'l conteníu d'esti sirvidor sacante que los busques o decidas siguilos.",
+  "about.domain_blocks.silenced.explanation": "Polo xeneral, nun ves los perfiles y el conteníu d'esti sirvidor sacante que los busques o decidas siguilos.",
   "about.domain_blocks.silenced.title": "Llendóse",
-  "about.domain_blocks.suspended.explanation": "Nun se procesa, atroxa nin intercambia nengún datu d'esti sirvidor, lo que fai que cualesquier interaición o comunicación colos sos perfiles seya imposible.",
+  "about.domain_blocks.suspended.explanation": "Nun se procesa, atroxa nin intercambia nengún datu d'esti sirvidor, lo que fai imposible cualesquier interaición o comunicación colos sos perfiles.",
   "about.domain_blocks.suspended.title": "Suspendióse",
   "about.not_available": "Esta información nun ta disponible nesti sirvidor.",
   "about.powered_by": "Una rede social descentralizada que tien la teunoloxía de {mastodon}",
   "about.rules": "Normes del sirvidor",
   "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Amestar o quitar de les llistes",
+  "account.badges.bot": "Automatizóse",
   "account.badges.group": "Grupu",
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
+  "account.block_short": "Bloquiar",
   "account.blocked": "Perfil bloquiáu",
+  "account.copy": "Copiar l'enlllaz al perfil",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
   "account.domain_blocked": "Dominiu bloquiáu",
   "account.edit_profile": "Editar el perfil",
   "account.enable_notifications": "Avisame cuando @{name} espublice artículos",
   "account.endorse": "Destacar nel perfil",
-  "account.featured_tags.last_status_never": "Nun hai nengún artículu",
+  "account.featured_tags.last_status_never": "Nun hai nenguna publicación",
   "account.featured_tags.title": "Etiquetes destacaes de: {name}",
   "account.follow": "Siguir",
+  "account.follow_back": "Siguir tamién",
   "account.followers": "Siguidores",
   "account.followers.empty": "Naide sigue a esti perfil.",
+  "account.following": "Siguiendo",
   "account.follows.empty": "Esti perfil nun sigue a naide.",
-  "account.hide_reblogs": "Anubrir los artículos compartíos de @{name}",
+  "account.go_to_profile": "Dir al perfil",
+  "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}",
@@ -37,6 +43,8 @@
   "account.mention": "Mentar a @{name}",
   "account.moved_to": "{name} indicó qu'agora la so cuenta nueva ye:",
   "account.mute": "Desactivar los avisos de @{name}",
+  "account.mute_notifications_short": "Silenciar avisos",
+  "account.mute_short": "Silenciar",
   "account.no_bio": "Nun se fornió nenguna descripción.",
   "account.open_original_page": "Abrir la páxina orixinal",
   "account.posts": "Artículos",
@@ -47,9 +55,11 @@
   "account.show_reblogs": "Amosar los artículos compartíos de @{name}",
   "account.unblock": "Desbloquiar a @{name}",
   "account.unblock_domain": "Desbloquiar el dominiu «{domain}»",
+  "account.unblock_short": "Desbloquiar",
   "account.unendorse": "Dexar de destacar nel perfil",
   "account.unfollow": "Dexar de siguir",
   "account.unmute": "Activar los avisos de @{name}",
+  "account.unmute_notifications_short": "Dexar de silenciar notificaciones",
   "account.unmute_short": "Activar los avisos",
   "account_note.placeholder": "Calca equí p'amestar una nota",
   "admin.dashboard.retention.average": "Media",
@@ -58,15 +68,25 @@
   "alert.rate_limited.message": "Volvi tentalo dempués de la hora: {retry_time, time, medium}.",
   "alert.unexpected.message": "Prodúxose un error inesperáu.",
   "alert.unexpected.title": "¡Meca!",
+  "alt_text_badge.title": "Testu alternativu",
   "announcement.announcement": "Anunciu",
   "attachments_list.unprocessed": "(ensin procesar)",
+  "block_modal.show_less": "Amosar menos",
+  "block_modal.show_more": "Amosar más",
+  "block_modal.they_cant_mention": "Nun van poder mencionate o siguite.",
+  "block_modal.they_cant_see_posts": "Nun pueden ver les tos espublizaciones y tu nun podrás ver les suyes.",
+  "block_modal.you_wont_see_mentions": "Nun verás espublizaciones que-yos mencionen.",
   "bundle_column_error.error.body": "La páxina solicitada nun se pudo renderizar. Ye posible que seya pola mor d'un fallu nel códigu o por un problema de compatibilidá del restolador.",
   "bundle_column_error.error.title": "¡Oh, non!",
   "bundle_column_error.network.body": "Hebo un error al tentar de cargar esta páxina. Esto pudo ser pola mor d'un problema temporal cola conexón a internet o con esti sirvidor.",
+  "bundle_column_error.network.title": "Fallu de rede",
+  "bundle_column_error.retry": "Retentar",
   "bundle_column_error.return": "Volver al aniciu",
   "bundle_column_error.routing.body": "Nun se pudo atopar la páxina solicitada. ¿De xuru que la URL de la barra de direiciones ta bien escrita?",
   "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Zarrar",
   "bundle_modal_error.message": "Asocedió daqué malo mentanto se cargaba esti componente.",
+  "bundle_modal_error.retry": "Retentar",
   "closed_registrations.other_server_instructions": "Darréu que Mastodon ye una rede social descentralizada, pues crear una cuenta n'otru sirvidor y siguir interactuando con esti.",
   "closed_registrations_modal.description": "Anguaño nun ye posible crear cuentes en {domain}, mas ten en cuenta que nun precises una cuenta nesti sirvidor pa usar Mastodon.",
   "closed_registrations_modal.find_another_server": "Atopar otru sirvidor",
@@ -78,6 +98,8 @@
   "column.community": "Llinia de tiempu llocal",
   "column.direct": "Menciones privaes",
   "column.domain_blocks": "Dominios bloquiaos",
+  "column.favourites": "Favoritos",
+  "column.firehose": "Feed en direuto",
   "column.follow_requests": "Solicitúes de siguimientu",
   "column.home": "Aniciu",
   "column.lists": "Llistes",
@@ -96,7 +118,9 @@
   "community.column_settings.remote_only": "Namás lo remoto",
   "compose.language.change": "Camudar la llingua",
   "compose.language.search": "Buscar llingües…",
-  "compose.published.body": "Espublizóse l'artículu.",
+  "compose.published.body": "Publicóse la publicación.",
+  "compose.published.open": "Abrir",
+  "compose.saved.body": "Guardóse la publicación.",
   "compose_form.direct_message_warning_learn_more": "Saber más",
   "compose_form.encryption_warning": "Los artículos de Mastodon nun tán cifraos de puntu a puntu. Nun compartas nengún tipu d'información sensible per Mastodon.",
   "compose_form.lock_disclaimer": "La to cuenta nun ye {locked}. Cualesquier perfil pue siguite pa ver los artículos que son namás pa siguidores.",
@@ -104,33 +128,55 @@
   "compose_form.placeholder": "¿En qué pienses?",
   "compose_form.poll.option_placeholder": "Opción {number}",
   "compose_form.poll.type": "Tipu",
-  "compose_form.publish_form": "Artículu nuevu",
+  "compose_form.publish": "Espublizar",
+  "compose_form.publish_form": "Publicación nueva",
+  "compose_form.reply": "Responder",
   "confirmation_modal.cancel": "Encaboxar",
   "confirmations.block.confirm": "Bloquiar",
   "confirmations.delete.confirm": "Desaniciar",
-  "confirmations.delete.message": "¿De xuru que quies desaniciar esti artículu?",
+  "confirmations.delete.message": "¿De xuru que quies desaniciar esta publicación?",
+  "confirmations.delete.title": "¿Quies desaniciar esta publicación?",
   "confirmations.delete_list.confirm": "Desaniciar",
+  "confirmations.delete_list.message": "¿De xuru que quies desaniciar permanentemente esta llista?",
+  "confirmations.delete_list.title": "¿Quies desaniciar la llista?",
   "confirmations.discard_edit_media.confirm": "Escartar",
+  "confirmations.edit.confirm": "Editar",
   "confirmations.edit.message": "La edición va sobrescribir el mensaxe que tas escribiendo. ¿De xuru que quies siguir?",
   "confirmations.logout.confirm": "Zarrar la sesión",
   "confirmations.logout.message": "¿De xuru que quies zarrar la sesión?",
+  "confirmations.logout.title": "¿Quies zarrar la sesión?",
   "confirmations.redraft.confirm": "Desaniciar y reeditar",
+  "confirmations.redraft.title": "¿Desaniciar y reeditar la publicación?",
   "confirmations.reply.confirm": "Responder",
+  "confirmations.reply.message": "Responder agora va sobrescribir el mensaxe que tas componiendo anguaño. ¿De xuru que quies siguir?",
   "confirmations.unfollow.confirm": "Dexar de siguir",
   "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
+  "confirmations.unfollow.title": "¿Dexar de siguir al usuariu?",
+  "content_warning.hide": "Esconder la publicación",
+  "content_warning.show": "Amosar de toes toes",
+  "content_warning.show_more": "Amosar más",
   "conversation.delete": "Desaniciar la conversación",
+  "conversation.mark_as_read": "Marcar como lleíu",
   "conversation.open": "Ver la conversación",
   "conversation.with": "Con {names}",
+  "copy_icon_button.copied": "Copiáu nel cartafueyu",
   "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",
   "directory.recently_active": "Con actividá recién",
+  "disabled_account_banner.account_settings": "Axustes de la cuenta",
   "dismissable_banner.community_timeline": "Esta seición contién los artículos públicos más actuales de los perfiles agospiaos nel dominiu {domain}.",
   "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.",
+  "domain_block_modal.block": "Bloquiar el sirvidor",
+  "domain_block_modal.they_cant_follow": "Naide d'esti sirvidor pue siguite.",
+  "domain_block_modal.title": "Bloquiar el dominiu?",
+  "domain_pill.server": "Sirvidor",
+  "domain_pill.username": "Nome d'usuariu",
+  "embed.instructions": "Empotra esta publicación nel to sitiu web copiando'l códigu d'abaxo.",
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
   "emoji_button.flags": "Banderes",
@@ -144,9 +190,10 @@
   "emoji_button.search_results": "Resultaos de la busca",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viaxes y llugares",
-  "empty_column.account_timeline": "¡Equí nun hai nengún artículu!",
+  "empty_column.account_suspended": "Cuenta suspendida",
+  "empty_column.account_timeline": "¡Equí nun hai nenguna publicación!",
   "empty_column.blocks": "Nun bloquiesti a nengún perfil.",
-  "empty_column.bookmarked_statuses": "Nun tienes nengún artículu en Marcadores. Cuando amiestes dalgún, apaez equí.",
+  "empty_column.bookmarked_statuses": "Nun tienes nenguna publicación en Marcadores. Cuando amiestes dalguna, va apaecer equí.",
   "empty_column.direct": "Nun tienes nenguna mención privada. Cuando unvies o recibas dalguna, apaez equí.",
   "empty_column.domain_blocks": "Nun hai nengún dominiu bloquiáu.",
   "empty_column.explore_statuses": "Agora nun hai nada en tendencia. ¡Volvi equí dempués!",
@@ -168,20 +215,21 @@
   "explore.trending_links": "Noticies",
   "explore.trending_statuses": "Artículos",
   "explore.trending_tags": "Etiquetes",
-  "filter_modal.added.context_mismatch_explanation": "Esta categoría de peñera nun s'aplica al contestu nel qu'accediesti a esti artículu. Si tamién quies que se peñere l'artículu nesti contestu, tienes d'editar la peñera.",
+  "filter_modal.added.context_mismatch_explanation": "Esta categoría de peñera nun s'aplica al contestu nel qu'accediesti a esta publicación. Si tamién quies que se peñere la publicación nesti contestu, tienes d'editar la peñera.",
   "filter_modal.added.context_mismatch_title": "¡El contestu nun coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de peñera caducó, tienes de camudar la so data de caducidá p'aplicala.",
   "filter_modal.added.expired_title": "¡La peñera caducó!",
   "filter_modal.added.review_and_configure": "Pa revisar y configurar a fondu esta categoría de peñera, vete a la {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Configuración de la peñera",
   "filter_modal.added.settings_link": "páxina de configuración",
-  "filter_modal.added.short_explanation": "Esti artículu amestóse a la categoría de peñera siguiente: {title}.",
+  "filter_modal.added.short_explanation": "Esta publicación amestóse a la categoría de peñera siguiente: {title}.",
   "filter_modal.added.title": "¡Amestóse la peñera!",
+  "filter_modal.select_filter.expired": "caducó",
   "filter_modal.select_filter.prompt_new": "Categoría nueva: {name}",
   "filter_modal.select_filter.search": "Buscar o crear",
   "filter_modal.select_filter.subtitle": "Usa una categoría esistente o créala",
-  "filter_modal.select_filter.title": "Peñerar esti artículu",
+  "filter_modal.select_filter.title": "Peñerar esta publicación",
-  "filter_modal.title.status": "Peñera d'un artículu",
+  "filter_modal.title.status": "Peñera d'una publicación",
   "firehose.all": "Tolos sirvidores",
   "firehose.local": "Esti sirvidor",
   "firehose.remote": "Otros sirvidores",
@@ -196,6 +244,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Aseméyase a los perfiles que siguiesti apocayá",
   "follow_suggestions.view_all": "Ver too",
   "follow_suggestions.who_to_follow": "A quién siguir",
+  "followed_tags": "Etiquetes siguíes",
   "footer.about": "Tocante a",
   "footer.directory": "Direutoriu de perfiles",
   "footer.get_app": "Consiguir l'aplicación",
@@ -210,30 +259,37 @@
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "ensin {additional}",
   "hashtag.column_settings.select.no_options_message": "Nun s'atopó nenguna suxerencia",
+  "hashtag.column_settings.select.placeholder": "Introduz etiquetes…",
+  "hashtag.column_settings.tag_mode.all": "Toes estes",
+  "hashtag.column_settings.tag_mode.any": "Cualesquiera d'estes",
+  "hashtag.column_settings.tag_mode.none": "Nenguna d'estes",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.follow": "Siguir a la etiqueta",
   "hashtag.unfollow": "Dexar de siguir a la etiqueta",
+  "hints.threads.replies_may_be_missing": "Ye posible que falten les rempuestes d'otros sirvidores.",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
+  "home.show_announcements": "Amosar anuncios",
   "interaction_modal.description.follow": "Con una cuenta de Mastodon, pues siguir a {name} pa recibir los artículos de so nel to feed d'aniciu.",
-  "interaction_modal.description.reblog": "Con una cuenta de Mastodon, pues compartir esti artículu colos perfiles que te sigan.",
+  "interaction_modal.description.reblog": "Con una cuenta de Mastodon, pues compartir esta publicación colos perfiles que te sigan.",
-  "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esti artículu.",
+  "interaction_modal.description.reply": "Con una cuenta de Mastodon, pues responder a esta publicación.",
   "interaction_modal.on_another_server": "N'otru sirvidor",
   "interaction_modal.on_this_server": "Nesti sirvidor",
-  "interaction_modal.title.reply": "Rempuesta al artículu de: {name}",
+  "interaction_modal.title.follow": "Siguir a {name}",
+  "interaction_modal.title.reply": "Rempuesta a la publicación de: {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# díes}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
   "keyboard_shortcuts.back": "Dir p'atrás",
   "keyboard_shortcuts.blocked": "Abrir la llista de perfiles bloquiaos",
-  "keyboard_shortcuts.boost": "Compartir un artículu",
+  "keyboard_shortcuts.boost": "Compartir una publicación",
   "keyboard_shortcuts.column": "Enfocar una columna",
   "keyboard_shortcuts.compose": "Enfocar l'área de composición",
   "keyboard_shortcuts.description": "Descripción",
   "keyboard_shortcuts.direct": "p'abrir la columna de les menciones privaes",
   "keyboard_shortcuts.down": "Baxar na llista",
-  "keyboard_shortcuts.enter": "Abrir un artículu",
+  "keyboard_shortcuts.enter": "Abrir una publicación",
   "keyboard_shortcuts.federated": "Abrir la llinia de tiempu federada",
   "keyboard_shortcuts.heading": "Atayos del tecláu",
   "keyboard_shortcuts.home": "Abrir la llinia de tiempu del aniciu",
@@ -247,15 +303,21 @@
   "keyboard_shortcuts.open_media": "Abrir el conteníu mutimedia",
   "keyboard_shortcuts.pinned": "Abrir la llista d'artículos fixaos",
   "keyboard_shortcuts.profile": "Abrir el perfil del autor/a",
-  "keyboard_shortcuts.reply": "Responder a un artículu",
+  "keyboard_shortcuts.reply": "Responder a una publicación",
   "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.toot": "Escribir una publicación nueva",
   "keyboard_shortcuts.unfocus": "Desenfocar l'área de composición/busca",
   "keyboard_shortcuts.up": "Xubir na llista",
+  "lightbox.close": "Zarrar",
+  "lightbox.next": "Siguiente",
   "limited_account_hint.action": "Amosar el perfil de toes toes",
+  "link_preview.author": "Por {name}",
+  "link_preview.more_from_author": "Más de {name}",
+  "lists.account.add": "Amestar a la llista",
+  "lists.account.remove": "Desaniciar de la llista",
   "lists.delete": "Desaniciar la llista",
   "lists.edit": "Editar la llista",
   "lists.edit.submit": "Camudar el títulu",
@@ -268,6 +330,7 @@
   "lists.search": "Buscar ente los perfiles que sigues",
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
+  "loading_indicator.label": "Cargando…",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -275,13 +338,17 @@
   "navigation_bar.direct": "Menciones privaes",
   "navigation_bar.domain_blocks": "Dominios bloquiaos",
   "navigation_bar.explore": "Esploración",
+  "navigation_bar.favourites": "Favoritos",
   "navigation_bar.filters": "Pallabres desactivaes",
   "navigation_bar.follow_requests": "Solicitúes de siguimientu",
+  "navigation_bar.followed_tags": "Etiquetes siguíes",
   "navigation_bar.follows_and_followers": "Perfiles que sigues y te siguen",
   "navigation_bar.lists": "Llistes",
   "navigation_bar.logout": "Zarrar la sesión",
+  "navigation_bar.moderation": "Moderación",
   "navigation_bar.mutes": "Perfiles colos avisos desactivaos",
   "navigation_bar.opened_in_classic_interface": "Los artículos, les cuentes y otres páxines específiques ábrense por defeutu na interfaz web clásica.",
+  "navigation_bar.personal": "Personal",
   "navigation_bar.pins": "Artículos fixaos",
   "navigation_bar.preferences": "Preferencies",
   "navigation_bar.public_timeline": "Llinia de tiempu federada",
@@ -291,14 +358,27 @@
   "notification.admin.sign_up": "{name} rexistróse",
   "notification.follow": "{name} siguióte",
   "notification.follow_request": "{name} solicitó siguite",
-  "notification.reblog": "{name} compartió'l to artículu",
+  "notification.label.mention": "Mención",
+  "notification.label.private_mention": "Mención privada",
+  "notification.label.private_reply": "Rempuesta privada",
+  "notification.label.reply": "Responder",
+  "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} mentóte",
+  "notification.moderation-warning.learn_more": "Deprender más",
+  "notification.poll": "Finó una encuesta na que votesti",
+  "notification.reblog": "{name} compartió la to publicación",
   "notification.status": "{name} ta acabante d'espublizar",
-  "notification.update": "{name} editó un artículu",
+  "notification.update": "{name} editó una publicación",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Fecho",
   "notifications.clear": "Borrar los avisos",
   "notifications.column_settings.admin.report": "Informes nuevos:",
   "notifications.column_settings.admin.sign_up": "Rexistros nuevos:",
+  "notifications.column_settings.favourite": "Favoritos:",
+  "notifications.column_settings.filter_bar.advanced": "Amosar toles categoríes",
   "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:",
@@ -308,10 +388,16 @@
   "notifications.column_settings.unread_notifications.category": "Avisos ensin lleer",
   "notifications.column_settings.unread_notifications.highlight": "Rescamplar los avisos ensin lleer",
   "notifications.column_settings.update": "Ediciones:",
+  "notifications.filter.all": "Too",
+  "notifications.filter.favourites": "Favoritos",
   "notifications.filter.mentions": "Menciones",
+  "notifications.filter.polls": "Resultaos de la encuesta",
   "notifications.group": "{count} avisos",
   "notifications.mark_as_read": "Marcar tolos avisos como lleíos",
   "notifications.permission_required": "Los avisos d'escritoriu nun tán disponibles porque nun se concedió'l permisu riquíu.",
+  "notifications.policy.accept": "Aceptar",
+  "notifications.policy.accept_hint": "Amosar n'avisos",
+  "onboarding.profile.note": "Biografía",
   "onboarding.profile.note_hint": "Pues @mentar a otros perfiles o poner #etiquetes…",
   "onboarding.start.lead": "Yá yes parte de Mastodon, una plataforma social multimedia descentralizada onde tu y non un algoritmu, personalices la to esperiencia. Vamos presentate esti llugar social nuevu:",
   "onboarding.start.skip": "¿Nun precises ayuda pa comenzar?",
@@ -327,10 +413,10 @@
   "poll.votes": "{votes, plural, one {# votu} other {# votos}}",
   "poll_button.add_poll": "Amestar una encuesta",
   "poll_button.remove_poll": "Quitar la encuesta",
-  "privacy.change": "Configurar la privacidá del artículu",
+  "privacy.change": "Configurar la privacidá de la publicación",
   "privacy.direct.short": "Perfiles específicos",
   "privacy.private.short": "Siguidores",
-  "privacy.public.short": "Artículu públicu",
+  "privacy.public.short": "Publicación pública",
   "privacy_policy.last_updated": "Data del últimu anovamientu: {date}",
   "privacy_policy.title": "Política de privacidá",
   "refresh": "Anovar",
@@ -347,13 +433,15 @@
   "relative_time.seconds": "{number} s",
   "relative_time.today": "güei",
   "reply_indicator.cancel": "Encaboxar",
+  "reply_indicator.poll": "Encuesta",
   "report.block": "Bloquiar",
+  "report.categories.legal": "Llegal",
   "report.categories.spam": "Spam",
   "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
   "report.category.subtitle": "Escueyi la meyor opción",
   "report.category.title": "Dinos qué pasa con esti {type}",
   "report.category.title_account": "perfil",
-  "report.category.title_status": "artículu",
+  "report.category.title_status": "publicación",
   "report.close": "Fecho",
   "report.comment.title": "¿Hai daqué más qu'habríemos saber?",
   "report.forward": "Reunviar a {target}",
@@ -363,6 +451,7 @@
   "report.placeholder": "Comentarios adicionales",
   "report.reasons.dislike": "Nun me presta",
   "report.reasons.dislike_description": "Nun ye daqué que quiera ver",
+  "report.reasons.legal": "Ye illegal",
   "report.reasons.other": "Ye daqué más",
   "report.reasons.other_description": "La incidencia nun s'axusta a les demás categoríes",
   "report.reasons.spam": "Ye spam",
@@ -372,7 +461,7 @@
   "report.rules.subtitle": "Seleiciona tolo que s'axuste",
   "report.rules.title": "¿Qué normes s'incumplen?",
   "report.statuses.subtitle": "Seleiciona tolo que s'axuste",
-  "report.statuses.title": "¿Hai dalgún artículu qu'apoye esti informe?",
+  "report.statuses.title": "¿Hai dalguna publicación qu'apoye esti informe?",
   "report.submit": "Unviar",
   "report.target": "Informe de: {target}",
   "report.thanks.take_action": "Equí tienes les opciones pa controlar qué ves en Mastodon:",
@@ -381,8 +470,11 @@
   "report.thanks.title_actionable": "Gracies pol informe, el casu yá ta n'investigación.",
   "report.unfollow": "Dexar de siguir a @{name}",
   "report.unfollow_explanation": "Sigues a esta cuenta. Pa dexar de ver los sos artículos nel to feed d'aniciu, dexa de siguila.",
-  "report_notification.attached_statuses": "{count, plural, one {Axuntóse {count} artículu} other {Axuntáronse {count} artículos}}",
+  "report_notification.attached_statuses": "{count, plural, one {Axuntóse {count} publicación} other {Axuntáronse {count} publicaciones}}",
+  "report_notification.categories.legal": "Llegal",
   "report_notification.categories.legal_sentence": "conteníu illegal",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
   "report_notification.open": "Abrir l'informe",
   "search.no_recent_searches": "Nun hai nenguna busca recién",
   "search.placeholder": "Buscar",
@@ -391,6 +483,7 @@
   "search.quick_action.go_to_hashtag": "Dir a la etiqueta {x}",
   "search.quick_action.status_search": "Artículos que concasen con {x}",
   "search.search_or_paste": "Busca o apiega una URL",
+  "search_popout.full_text_search_disabled_message": "Nun ta disponible nel dominiu {domain}.",
   "search_popout.language_code": "códigu de llingua ISO",
   "search_popout.options": "Opciones de busca",
   "search_popout.quick_actions": "Aiciones rápides",
@@ -404,37 +497,42 @@
   "search_results.see_all": "Ver too",
   "search_results.statuses": "Artículos",
   "search_results.title": "Busca de: {q}",
+  "server_banner.is_one_of_many": "{domain} ye unu de los munchos sirvidores independientes de Mastodon que pues usar pa participar nel fediversu.",
   "server_banner.server_stats": "Estadístiques del sirvidor:",
   "sign_in_banner.create_account": "Crear una cuenta",
+  "sign_in_banner.mastodon_is": "Mastodon ye la meyor manera de siguir al momentu qué pasa.",
+  "sign_in_banner.sign_in": "Aniciar la sesión",
   "sign_in_banner.sso_redirect": "Aniciar la sesión o rexistrase",
   "status.admin_account": "Abrir la interfaz de moderación pa @{name}",
   "status.admin_domain": "Abrir la interfaz de moderación pa «{domain}»",
-  "status.admin_status": "Abrir esti artículu na interfaz de moderación",
+  "status.admin_status": "Abrir esta publicación na interfaz de moderación",
   "status.block": "Bloquiar a @{name}",
   "status.bookmark": "Meter en Marcadores",
-  "status.cannot_reblog": "Esti artículu nun se pue compartir",
+  "status.cannot_reblog": "Esta publicación nun se pue compartir",
-  "status.copy": "Copiar l'enllaz al artículu",
+  "status.copy": "Copiar l'enllaz a la publicación",
   "status.delete": "Desaniciar",
   "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.filter": "Peñerar esti artículu",
+  "status.embed": "Consiguir el códigu pa empotrar",
+  "status.filter": "Peñerar esta publicación",
   "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}",
   "status.mute_conversation": "Desactivar los avisos de la conversación",
-  "status.open": "Espander esti artículu",
+  "status.open": "Espander esta publicación",
   "status.pin": "Fixar nel perfil",
-  "status.pinned": "Artículu fixáu",
+  "status.pinned": "Publicación fixada",
   "status.read_more": "Lleer más",
   "status.reblog": "Compartir",
   "status.reblogged_by": "{name} compartió",
-  "status.reblogs.empty": "Naide nun compartió esti artículu. Cuando daquién lo faiga, apaez equí.",
+  "status.reblogs.empty": "Naide nun compartió esta publicación. Cuando daquién lo faiga, va apaecer equí.",
   "status.redraft": "Desaniciar y reeditar",
+  "status.remove_bookmark": "Desaniciar el marcador",
   "status.replied_to": "En rempuesta a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al filu",
@@ -447,6 +545,7 @@
   "status.uncached_media_warning": "La previsualización nun ta disponible",
   "status.unmute_conversation": "Activar los avisos de la conversación",
   "status.unpin": "Lliberar del perfil",
+  "subscribed_languages.save": "Guardar los cambeos",
   "tabs_bar.home": "Aniciu",
   "tabs_bar.notifications": "Avisos",
   "time_remaining.days": "{number, plural, one {Queda # día} other {Queden # díes}}",
@@ -459,6 +558,7 @@
   "units.short.billion": "{count} MM",
   "units.short.million": "{count} M",
   "units.short.thousand": "{count} mil",
+  "upload_area.title": "Arrastra y suelta pa xubir",
   "upload_button.label": "Amestar ficheros multimedia",
   "upload_error.poll": "La xuba de ficheros nun ta permitida coles encuestes.",
   "upload_form.audio_description": "Describi'l conteníu pa persones sordes y/o ciegues",
@@ -468,14 +568,15 @@
   "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.exit_fullscreen": "Colar de la pantalla completa",
   "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/az.json

@@ -0,0 +1,270 @@
+{
+  "about.blocks": "Moderasiya olunan serverlər",
+  "about.contact": "Əlaqə:",
+  "about.disclaimer": "Mastodon pulsuz, açıq-mənbəli proqram təminatıdır və Mastodon gGmbH-nin əmtəə nişanıdır.",
+  "about.domain_blocks.no_reason_available": "Səbəb naməlumdur",
+  "about.domain_blocks.preamble": "Mastodon adətən fediversedəki hər hansısa bir serverdən olan məzmuna baxmaq və istifadəçilərlə qarşılıqlı əlaqədə olmaq imkanı verir. Bunlar bu serverdə edilmiş istisnalardır.",
+  "about.domain_blocks.silenced.explanation": "Siz bu serverdəki profilləri və məzmunu xüsusi olaraq axtarmasanız və ya izləməsəniz ümumiyyətlə görməyəcəksiniz.",
+  "about.domain_blocks.silenced.title": "Məhdudlaşdırılmış",
+  "about.domain_blocks.suspended.explanation": "Bu serverdən heç bir data emal edilməyəcək, saxlanılmayacaq və ya mübadilə edilməyəcək və bu serverdən olan istifadəçilərlə hər hansı qarşılıqlı əlaqə qeyri-mümkün olacaq.",
+  "about.domain_blocks.suspended.title": "Qadağa qoyulub",
+  "about.not_available": "Bu məlumat bu serverdə əlçatan edilməyib.",
+  "about.powered_by": "{mastodon} tərəfindən təchiz edilən desentralizasiya edilmiş sosial media",
+  "about.rules": "Server qaydaları",
+  "account.account_note_header": "Şəxsi qeyd",
+  "account.add_or_remove_from_list": "Siyahılara əlavə et və ya sil",
+  "account.badges.bot": "Avtomatlaşdırılmış",
+  "account.badges.group": "Qrup",
+  "account.block": "@{name} istifadəçisini blokla",
+  "account.block_domain": "{domain} domenini blokla",
+  "account.block_short": "Blok",
+  "account.blocked": "Bloklanıb",
+  "account.cancel_follow_request": "İzləməni ləğv et",
+  "account.copy": "Profil linkini kopyala",
+  "account.direct": "@{name} istifadəçisini fərdi olaraq etiketlə",
+  "account.disable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndərməyi dayandır",
+  "account.domain_blocked": "Domen bloklanıb",
+  "account.edit_profile": "Profili redaktə et",
+  "account.enable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndər",
+  "account.endorse": "Profildə seçilmişlərə əlavə et",
+  "account.featured_tags.last_status_at": "Son paylaşım {date} tarixində olub",
+  "account.featured_tags.last_status_never": "Paylaşım yoxdur",
+  "account.featured_tags.title": "{name} istifadəçisinin seçilmiş heşteqləri",
+  "account.follow": "İzlə",
+  "account.follow_back": "Sən də izlə",
+  "account.followers": "İzləyicilər",
+  "account.followers.empty": "Bu istifadəçini hələ ki, heç kim izləmir.",
+  "account.followers_counter": "{count, plural, one {{counter} izləyici} other {{counter} izləyici}}",
+  "account.following": "İzləyir",
+  "account.following_counter": "{count, plural, one {{counter} izləyir} other {{counter} izləyir}}",
+  "account.follows.empty": "Bu istifadəçi hələ ki, heç kimi izləmir.",
+  "account.go_to_profile": "Profilə get",
+  "account.hide_reblogs": "@{name} istifadəçisindən olan gücləndirmələri gizlət",
+  "account.in_memoriam": "Xatirə.",
+  "account.joined_short": "Qoşulub",
+  "account.languages": "Abunə olunmuş dilləri dəyiş",
+  "account.link_verified_on": "Bu linkin dəqiqliyi {date} tarixində yoxlanılıb",
+  "account.locked_info": "Bu hesabın məxfilik statusu kilidlənib. Hesabın sahibi onu kimin izləyə biləcəyini manual olaraq təyin edir.",
+  "account.media": "Media",
+  "account.mention": "@{name} istifadəçisini teq et",
+  "account.moved_to": "{name} onun yeni hesabının artıq bu olduğunu bildirdi:",
+  "account.mute": "@{name} istifadəçisini susdur",
+  "account.mute_notifications_short": "Bildirişləri səssizləşdir",
+  "account.mute_short": "Səssizləşdir",
+  "account.muted": "Səssizləşdirilib",
+  "account.mutual": "Ortaq",
+  "account.no_bio": "Təsvir göstərilməyib.",
+  "account.open_original_page": "Orijinal səhifəni aç",
+  "account.posts": "Paylaşım",
+  "account.posts_with_replies": "Paylaşım və cavablar",
+  "account.report": "@{name} istifadəçisini şikayət et",
+  "account.requested": "Təsdiq edilməsi gözlənilir. İzləmə sorğusunu ləğv etmək üçün kliklə",
+  "account.requested_follow": "{name} sizi izləmək sorğusu göndərib",
+  "account.share": "@{name} profilini paylaş",
+  "account.show_reblogs": "@{name} istifadəçisindən olan gücləndirmələri göstər",
+  "account.statuses_counter": "{count, plural, one {{counter} paylaşım} other {{counter} paylaşım}}",
+  "account.unblock": "@{name} blokunu aç",
+  "account.unblock_domain": "{domain} domeninin blokunu aç",
+  "account.unblock_short": "Bloku aç",
+  "account.unendorse": "Profildə seçilmişlərə əlavə etmə",
+  "account.unfollow": "İzləmədən çıxar",
+  "account.unmute": "@{name} səssizləşdirmədən çıxart",
+  "account.unmute_notifications_short": "Bildirişlərin səsini aç",
+  "account.unmute_short": "Səssizləşdirmədən çıxart",
+  "account_note.placeholder": "Qeyd əlavə etmək üçün kliklə",
+  "admin.dashboard.daily_retention": "Qeydiyyatdan sonrakı günə görə istifadəçi qalma dərəcəsi",
+  "admin.dashboard.monthly_retention": "Qeydiyyatdan sonrakı aya görə istifadəçi qalma dərəcəsi",
+  "admin.dashboard.retention.average": "Orta",
+  "admin.dashboard.retention.cohort": "Qeydiyyatdan keçmə ayı",
+  "admin.dashboard.retention.cohort_size": "Yeni istifadəçilər",
+  "admin.impact_report.instance_accounts": "Bunun siləcəyi istifadəçi hesabları",
+  "admin.impact_report.instance_followers": "İstifadəçilərimizin itirəcəyi izləyici sayı",
+  "admin.impact_report.instance_follows": "Onların istifadəçilərinin itirəcəyi izləyici sayı",
+  "admin.impact_report.title": "Təsirin xülasəsi",
+  "alert.rate_limited.message": "Zəhmət olmasa, {retry_time, time, medium} sonra yenidən cəhd edin.",
+  "alert.rate_limited.title": "Sürət limiti",
+  "alert.unexpected.message": "Bilinməyən bir xəta baş verdi.",
+  "alert.unexpected.title": "Ah!",
+  "alt_text_badge.title": "Alternativ mətn",
+  "announcement.announcement": "Elan",
+  "attachments_list.unprocessed": "(emal edilməyib)",
+  "audio.hide": "Audionu gizlət",
+  "block_modal.remote_users_caveat": "Biz {domain} serverindən qərarınıza hörmət etməsini xahiş edəcəyik. Bununla belə, bəzi serverlər blokları fərqli şəkildə idarə edə bildiyi üçün uyğunluğa zəmanət verilmir. İctimai paylaşımlar hələ də daxil olmayan istifadəçilərə görünə bilər.",
+  "block_modal.show_less": "Daha az göstər",
+  "block_modal.show_more": "Daha çox göstər",
+  "block_modal.they_cant_mention": "O səni teq edə bilməz və ya izləyə bilməz.",
+  "block_modal.they_cant_see_posts": "O sənin paylaşımlarını görməyəcək, sən də onun paylaşımlarını görməyəcəksən.",
+  "block_modal.they_will_know": "O sənin onu blokladığını görə biləcək.",
+  "block_modal.title": "İstifadəçi bloklansın?",
+  "block_modal.you_wont_see_mentions": "Onu teq edən postları görməyəcəksən.",
+  "boost_modal.combo": "Növbəti dəfə bunu atlamaq üçün {combo} klikləyə bilərsən",
+  "boost_modal.reblog": "Paylaşım gücləndirilsin?",
+  "boost_modal.undo_reblog": "Paylaşımın gücləndirilməsi ləğv edilsin?",
+  "bundle_column_error.copy_stacktrace": "Xəta hesabatını kopyala",
+  "bundle_column_error.error.body": "Tələb olunan səhifəni göstərmək mümkün olmadı. Bu, kodumuzdakı səhv və ya brauzer uyğunluğu problemi ilə bağlı ola bilər.",
+  "bundle_column_error.error.title": "Ah, yox!",
+  "bundle_column_error.network.body": "Bu səhifəni yükləməyə çalışarkən xəta baş verdi. Bu, internet bağlantınız və ya bu serverlə bağlı müvəqqəti problemlə əlaqədar ola bilər.",
+  "bundle_column_error.network.title": "Şəbəkə xətası",
+  "bundle_column_error.retry": "Yenidən cəhd et",
+  "bundle_column_error.return": "Ana səhifəyə qayıt",
+  "bundle_column_error.routing.body": "Tələb olunan səhifəni tapmaq mümkün olmadı. Ünvan çubuğundakı URL-nin düzgün olduğuna əminsiniz?",
+  "bundle_column_error.routing.title": "404",
+  "bundle_modal_error.close": "Bağla",
+  "bundle_modal_error.retry": "Yenidən cəhd et",
+  "closed_registrations.other_server_instructions": "Mastodon desentralizasiya edilmiş olduğu üçün başqa bir serverdə hesab yarada və hələ də bu serverdən istifadə edə bilərsiniz.",
+  "closed_registrations_modal.description": "{domain} serverində hesab yaratmaq hazırda mümkün deyil, lakin nəzərə alın ki, Mastodondan istifadə etmək üçün xüsusi olaraq {domain} serverində hesaba ehtiyacınız yoxdur.",
+  "closed_registrations_modal.find_another_server": "Başqa server tap",
+  "closed_registrations_modal.preamble": "Mastodon desentralizasiya edilib, ona görə də hesabınızı harada yaratmağınızdan asılı olmayaraq, siz bu serverdə hər kəsi izləyə və onunla əlaqə saxlaya biləcəksiniz. Siz hətta özünüz server aça bilərsiniz!",
+  "closed_registrations_modal.title": "Mastodonda qeydiyyatdan keçmək",
+  "column.about": "Haqqında",
+  "column.blocks": "Bloklanmış istifadəçilər",
+  "column.bookmarks": "Əlfəcinlər",
+  "column.community": "Lokal zaman qrafiki",
+  "column.direct": "Fərdi teqlər",
+  "column.directory": "Profillər arasında gəz",
+  "column.domain_blocks": "Bloklanmış domenlər",
+  "column.favourites": "Sevimlilər",
+  "column.firehose": "Canlı lentlər",
+  "column.follow_requests": "İzləyici sorğuları",
+  "column.home": "Ana səhifə",
+  "column.lists": "Siyahılar",
+  "column.mutes": "Səssizləşdirilmiş istifadəçilər",
+  "column.notifications": "Bildirişlər",
+  "column.pins": "Bərkidilmiş paylaşımlar",
+  "column.public": "Federasiya zaman qrafiki",
+  "column_back_button.label": "Geriyə",
+  "column_header.hide_settings": "Parametrləri gizlət",
+  "column_header.moveLeft_settings": "Sütunu sola köçür",
+  "column_header.moveRight_settings": "Sütunu sağa köçür",
+  "column_header.pin": "Bərkit",
+  "column_header.show_settings": "Parametrləri göstər",
+  "column_header.unpin": "Bərkitmə",
+  "column_subheading.settings": "Parametrlər",
+  "community.column_settings.local_only": "Sadəcə lokalda",
+  "community.column_settings.media_only": "Sadəcə media",
+  "community.column_settings.remote_only": "Sadəcə uzaq serverlər",
+  "compose.language.change": "Dili dəyiş",
+  "compose.language.search": "Dil axtar...",
+  "compose.published.body": "Paylaşıldı.",
+  "compose.published.open": "Bax",
+  "compose.saved.body": "Paylaşım yadda saxlandı.",
+  "compose_form.direct_message_warning_learn_more": "Ətraflı öyrən",
+  "compose_form.encryption_warning": "Mastodondakı paylaşımlar ucdan-uca şifrələnmir. Mastodonda heç bir həssas məlumat paylaşmayın.",
+  "compose_form.hashtag_warning": "Bu yazı ictimai olmadığı üçün heç bir heşteqdə göstərilməyəcək. Yalnız açıq yazılar heşteq ilə axtarıla bilər.",
+  "compose_form.lock_disclaimer": "Hesabınız {locked} deyil. Sadəcə izləyicilər üçün paylaşımlarınıza baxmaq üçün hər kəs sizi izləyə bilər.",
+  "compose_form.lock_disclaimer.lock": "kilidli",
+  "compose_form.placeholder": "Ağlınızdan nə keçir?",
+  "compose_form.poll.duration": "Sorğunun müddəti",
+  "compose_form.poll.multiple": "Çoxlu cavab",
+  "compose_form.poll.option_placeholder": "Seçim {number}",
+  "compose_form.poll.switch_to_multiple": "Çoxsaylı cavablara icazə vermək üçün sorğunu redaktə et",
+  "compose_form.poll.switch_to_single": "Tək cavaba icazə vermək üçün sorğunu redaktə et",
+  "compose_form.poll.type": "Stil",
+  "compose_form.publish": "Paylaş",
+  "compose_form.publish_form": "Yeni paylaşım",
+  "compose_form.reply": "Cavabla",
+  "compose_form.save_changes": "Yenilə",
+  "compose_form.spoiler.marked": "Məzmun xəbərdarlığını sil",
+  "compose_form.spoiler.unmarked": "Məzmun xəbərdarlığı əlavə et",
+  "compose_form.spoiler_placeholder": "Məzmun xəbərdarlığı (məcburi deyil)",
+  "confirmation_modal.cancel": "İmtina",
+  "confirmations.block.confirm": "Blokla",
+  "confirmations.delete.confirm": "Sil",
+  "confirmations.delete.message": "Bu paylaşımı silmək istədiyinizə əminsiniz?",
+  "confirmations.delete.title": "Paylaşım silinsin?",
+  "confirmations.delete_list.confirm": "Sil",
+  "confirmations.delete_list.message": "Bu siyahını həmişəlik silmək istədiyinizə əminsiniz?",
+  "confirmations.delete_list.title": "Siyahı silinsin?",
+  "confirmations.discard_edit_media.confirm": "Ləğv et",
+  "confirmations.discard_edit_media.message": "Media təsvirində və ya önizləmədə yadda saxlanmamış dəyişiklikləriniz var, ləğv edilsin?",
+  "confirmations.edit.confirm": "Redaktə et",
+  "confirmations.edit.message": "Redaktə etmək hazırda tərtib etdiyiniz mesajın üzərinə yazacaq. Davam etmək istədiyinizə əminsiniz?",
+  "confirmations.edit.title": "Paylaşım yenidə yazılsın?",
+  "confirmations.logout.confirm": "Çıxış et",
+  "confirmations.logout.message": "Çıxmaq istədiyinizə əminsiniz?",
+  "confirmations.logout.title": "Çıxış edilsin?",
+  "confirmations.mute.confirm": "Səssizləşdir",
+  "confirmations.redraft.confirm": "Sil və qaralamaya köçür",
+  "confirmations.redraft.message": "Bu paylaşımı silmək və qaralamaya köçürmək istədiyinizə əminsiniz? Bəyənmələr və gücləndirmələr itəcək və orijinal paylaşıma olan cavablar tənha qalacaq.",
+  "confirmations.redraft.title": "Paylaşım silinsin & qaralamaya köçürülsün?",
+  "confirmations.reply.confirm": "Cavabla",
+  "confirmations.reply.message": "İndi cavab vermək hal-hazırda yazdığınız mesajın üzərinə yazacaq. Davam etmək istədiyinizə əminsiniz?",
+  "confirmations.reply.title": "Paylaşım yenidən yazılsın?",
+  "confirmations.unfollow.confirm": "İzləmədən çıxar",
+  "confirmations.unfollow.message": "{name} izləmədən çıxmaq istədiyinizə əminsiniz?",
+  "confirmations.unfollow.title": "İstifadəçi izləmədən çıxarılsın?",
+  "content_warning.hide": "Paylaşımı gizlət",
+  "content_warning.show": "Yenə də göstər",
+  "content_warning.show_more": "Daha çox göstər",
+  "conversation.delete": "Söhbəti sil",
+  "conversation.mark_as_read": "Oxunmuş kimi qeyd et",
+  "conversation.open": "Söhbətə bax",
+  "conversation.with": "{names} ilə",
+  "copy_icon_button.copied": "Mübadilə buferinə köçürüldü",
+  "copypaste.copied": "Kopyalandı",
+  "copypaste.copy_to_clipboard": "Kopyala",
+  "directory.federated": "Bilinən fediversedən",
+  "directory.local": "Sadəcə {domain}",
+  "directory.new_arrivals": "Yeni gələnlər",
+  "directory.recently_active": "Bayaq aktiv olanlar",
+  "disabled_account_banner.account_settings": "Hesab parametrləri",
+  "disabled_account_banner.text": "Sizin hesabınız {disabledAccount} hal-hazırda deaktiv edilib.",
+  "dismissable_banner.community_timeline": "Bunlar, hesabları {domain} serverində yerləşən insanların ən son ictimai paylaşımlarıdır.",
+  "dismissable_banner.dismiss": "Bağla",
+  "domain_block_modal.block": "Serveri blokla",
+  "domain_block_modal.block_account_instead": "@{name} istifadəçisini blokla",
+  "domain_block_modal.they_can_interact_with_old_posts": "Bu serverdən olan insanlar köhnə paylaşımlarınızla əlaqə qura bilər.",
+  "domain_block_modal.they_cant_follow": "Bu serverdən heç kim sizi izləyə bilməz.",
+  "domain_block_modal.they_wont_know": "Onlar bloklandıqlarını bilməyəcəklər.",
+  "domain_block_modal.title": "Domen bloklansın?",
+  "domain_block_modal.you_will_lose_num_followers": "Siz {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} izləyici}} və izlədiyiniz {followingCount, plural, one {{followingCountDisplay} istifadəçini} other {{followingCountDisplay} istifadəçini}} itirəcəksiniz.",
+  "domain_block_modal.you_will_lose_relationships": "Bu serverdən olan bütün izləyicilərinizi və izlədiklərinizi itirəcəksiniz.",
+  "domain_block_modal.you_wont_see_posts": "Bu serverdən olan paylaşımları və istifadəçilərdən olan bildirişləri görməyəcəksiniz.",
+  "domain_pill.activitypub_lets_connect": "Bu, təkcə Mastodonda deyil, həm də müxtəlif sosial tətbiqlərdə insanlarla əlaqə saxlamağa və onlarla ünsiyyət qurmağa imkan verir.",
+  "domain_pill.activitypub_like_language": "ActivityPub-ı Mastodonun digər sosial şəbəkələrlə danışdığı dil kimi düşünə bilərsiniz.",
+  "domain_pill.server": "Server",
+  "domain_pill.their_handle": "Tanıdıcısı:",
+  "domain_pill.their_server": "Onların bütün paylaşımlarının yaşadığı rəqəmsal ev.",
+  "domain_pill.their_username": "Serverdəki unikal identifikator. Fərqli serverlərdə eyni istifadəçi adı ilə istifadəçilər tapmaq mümkündür.",
+  "domain_pill.username": "İstifadəçi adı",
+  "domain_pill.whats_in_a_handle": "Tanıdıcı nədir?",
+  "domain_pill.who_they_are": "Tanıdıcılar kimin kim olduğunu və harada olduğunu bildirdiyi üçün siz <button>ActivityPub tərəfindən dəstəklənən platformaların</button> sosial şəbəkəsindəki bütün insanlarla əlaqə saxlaya bilərsiniz.",
+  "domain_pill.who_you_are": "Tanıdıcılar sizin kim olduğunuzu və harada olduğunuzu bildirdiyi üçün <button>ActivityPub tərəfindən dəstəklənən platformaların</button> sosial şəbəkəsindəki bütün insanlar sizlə əlaqə saxlaya bilər.",
+  "domain_pill.your_handle": "Tanıdıcınız:",
+  "domain_pill.your_server": "Bütün paylaşımlarınızın yaşadığı rəqəmsal ev. Buranı bəyənmirsiniz? İstədiyiniz vaxt serverdən köçün və izləyicilərinizi də aparın.",
+  "domain_pill.your_username": "Serverdəki unikal identifikatoruz. Fərqli serverlərdə eyni istifadəçi adı ilə istifadəçilər tapmaq mümkündür.",
+  "embed.instructions": "Aşağıdakı kodu kopyalayaraq bu postu veb-saytınıza yerləşdirin.",
+  "embed.preview": "Belə görünəcək:",
+  "emoji_button.activity": "Aktivlik",
+  "emoji_button.clear": "Təmizlə",
+  "emoji_button.custom": "Özəl",
+  "emoji_button.flags": "Bayraqlar",
+  "emoji_button.food": "Yemək və içki",
+  "emoji_button.label": "Emoji daxil et",
+  "emoji_button.nature": "Təbiət",
+  "emoji_button.not_found": "Uyğun emoji tapılmadı",
+  "emoji_button.objects": "Obyektlər",
+  "emoji_button.people": "İnsanlar",
+  "emoji_button.recent": "Tez-tez istifadə edilən",
+  "emoji_button.search": "Axtar...",
+  "emoji_button.search_results": "Axtarış nəticələri",
+  "emoji_button.symbols": "Simvollar",
+  "emoji_button.travel": "Səyahət və məkanlar",
+  "empty_column.account_hides_collections": "Bu istifadəçi bu məlumatı əlçatan etməməyi seçib",
+  "empty_column.account_suspended": "Hesab silinib",
+  "empty_column.account_timeline": "Heç bir paylaşım yoxdur!",
+  "empty_column.account_unavailable": "Profil əlçatan deyil",
+  "empty_column.blocks": "Hələ ki, heç bir istifadəçini bloklamamasınız.",
+  "empty_column.bookmarked_statuses": "Hələ ki, heç bir paylaşımı yadda saxlamamısınız. Yadda saxlayanda burada görünəcək.",
+  "empty_column.community": "Lokal zaman qrafiki boşdur. Topun yuvarlanmağa başlaması üçün ictimai bir şey paylaşın!",
+  "empty_column.direct": "Gizli etiketiniz yoxdur. Göndərdikdə və ya qəbul etdikdə burada görəcəksiniz.",
+  "empty_column.domain_blocks": "Hələ ki, bloklanmış domen yoxdur.",
+  "empty_column.explore_statuses": "Hal-hazırda trenddə heç yoxdur. Daha sonra yenidən yoxlayın!",
+  "empty_column.favourited_statuses": "Bəyəndiyiniz paylaşımlar yoxdur. Birini bəyəndikdə burada görünəcək.",
+  "empty_column.favourites": "Bu paylaşımı hələ ki, heç kim bəyənməyib. Bəyənildikdə burada görünəcək.",
+  "empty_column.follow_requests": "İzləmə sorğularınız yoxdur. Qəbul etdikdə burada görəcəksiniz.",
+  "empty_column.followed_tags": "Heç bir heşteq izləmirsiniz. İzlədikdə burada görünəcək.",
+  "empty_column.hashtag": "Bu heşteqdə hələ ki, heç nə yoxdur.",
+  "follow_suggestions.hints.friends_of_friends": "Bu profil izlədiyiniz insanlar arasında populyardır.",
+  "follow_suggestions.hints.most_followed": "Bu profil {domain} serverində ən çox izlənilənlərdən biridir."
+}

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": "Схаваць аўдыя",
@@ -97,6 +98,8 @@
   "block_modal.title": "Заблакіраваць карыстальніка?",
   "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "boost_modal.combo": "Націсніце {combo}, каб прапусціць наступным разам",
+  "boost_modal.reblog": "Пашырыць допіс?",
+  "boost_modal.undo_reblog": "Прыбраць допіс?",
   "bundle_column_error.copy_stacktrace": "Скапіраваць справаздачу пра памылку",
   "bundle_column_error.error.body": "Запытаная старонка не можа быць адлюстраваная. Гэта магло стацца праз хібу ў нашым кодзе, або праз памылку сумяшчальнасці з браўзерам.",
   "bundle_column_error.error.title": "Халера!",
@@ -151,7 +154,7 @@
   "compose_form.hashtag_warning": "Гэты допіс не будзе паказаны пад аніякім хэштэгам, бо ён не публічны. Толькі публічныя допісы можна знайсці па хэштэгу.",
   "compose_form.lock_disclaimer": "Ваш уліковы запіс не {locked}. Усе могуць падпісацца на вас, каб бачыць допісы толькі для падпісчыкаў.",
   "compose_form.lock_disclaimer.lock": "закрыты",
-  "compose_form.placeholder": "Што здарылася?",
+  "compose_form.placeholder": "Што ў вас новага?",
   "compose_form.poll.duration": "Працягласць апытання",
   "compose_form.poll.multiple": "Множны выбар",
   "compose_form.poll.option_placeholder": "Варыянт {number}",
@@ -194,6 +197,7 @@
   "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
   "content_warning.hide": "Схаваць допіс",
   "content_warning.show": "Усё адно паказаць",
+  "content_warning.show_more": "Паказаць усё роўна",
   "conversation.delete": "Выдаліць размову",
   "conversation.mark_as_read": "Адзначыць прачытаным",
   "conversation.open": "Прагледзець размову",
@@ -219,6 +223,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 размаўляе з іншымі сацыяльнымі сеткамі.",
@@ -300,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Скарыстайцеся існуючай катэгорыяй або стварыце новую",
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
-  "filter_warning.matches_filter": "Адпавядае фільтру \"{title}\"",
+  "filter_warning.matches_filter": "Адпавядае фільтру \"<span>{title}</span>\"",
   "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
@@ -350,6 +356,14 @@
   "hashtag.follow": "Падпісацца на хэштэг",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
+  "hints.profiles.followers_may_be_missing": "Падпісчыкі гэтага профілю могуць адсутнічаць.",
+  "hints.profiles.follows_may_be_missing": "Падпіскі гэтага профілю могуць адсутнічаць.",
+  "hints.profiles.posts_may_be_missing": "Некаторыя допісы гэтага профілю могуць адсутнічаць.",
+  "hints.profiles.see_more_followers": "Глядзець больш падпісаных на {domain}",
+  "hints.profiles.see_more_follows": "Глядзець больш падпісак на {domain}",
+  "hints.profiles.see_more_posts": "Глядзець больш допісаў на {domain}",
+  "hints.threads.replies_may_be_missing": "Адказы зь іншых сэрвэраў могуць адсутнічаць.",
+  "hints.threads.see_more": "Глядзіце больш адказаў на {domain}",
   "home.column_settings.show_reblogs": "Паказваць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
@@ -357,7 +371,17 @@
   "home.pending_critical_update.link": "Прагледзець абнаўленні",
   "home.pending_critical_update.title": "Даступна крытычнае абнаўленне бяспекі!",
   "home.show_announcements": "Паказаць аб'явы",
+  "ignore_notifications_modal.disclaimer": "Mastodon ня можа йнфармаваць карыстальнікаў аб тым, што вы прайігнаравалі йх паведамленьні. Ігнараваньне паведамленьняў не спыніць іх адпраўку.",
+  "ignore_notifications_modal.filter_instead": "Замест гэтага адфільтраваць",
+  "ignore_notifications_modal.filter_to_act_users": "Вы па-ранейшаму зможаце прымаць, адхіляць ці скардзіцца на карыстальнікаў",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Фільтраваньне дапамагае пазьбегнуць патэнцыйнай блытаніны",
+  "ignore_notifications_modal.filter_to_review_separately": "Вы можаце прагледзець адфільтраваныя паведамленьні асобна",
+  "ignore_notifications_modal.ignore": "Ігнараваць паведамленьні",
+  "ignore_notifications_modal.limited_accounts_title": "Ігнараваць паведамленьні ад абмежаваных уліковых запісаў?",
+  "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": "Маючы ўліковы запіс Mastodon, вы можаце ўпадабаць гэты допіс, каб паведаміць аўтару, што ён вам падабаецца, і захаваць яго на будучыню.",
   "interaction_modal.description.follow": "Маючы акаўнт у Mastodon, вы можаце падпісацца на {name}, каб бачыць яго/яе допісы ў сваёй хатняй стужцы.",
   "interaction_modal.description.reblog": "З уліковым запісам Mastodon, вы можаце пашырыць гэты пост, каб падзяліцца ім са сваімі падпісчыкамі.",
@@ -434,6 +458,7 @@
   "lists.subheading": "Вашыя спісы",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
   "loading_indicator.label": "Загрузка…",
+  "media_gallery.hide": "Схаваць",
   "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
   "mute_modal.hide_options": "Схаваць опцыі",
@@ -461,6 +486,7 @@
   "navigation_bar.follows_and_followers": "Падпіскі і падпісчыкі",
   "navigation_bar.lists": "Спісы",
   "navigation_bar.logout": "Выйсці",
+  "navigation_bar.moderation": "Мадэрацыя",
   "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
   "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
   "navigation_bar.personal": "Асабістае",
@@ -479,11 +505,13 @@
   "notification.favourite": "Ваш допіс упадабаны {name}",
   "notification.follow": "{name} падпісаўся на вас",
   "notification.follow_request": "{name} адправіў запыт на падпіску",
+  "notification.follow_request.name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} 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": "Некаторыя вашыя допісы былі выдаленыя.",
@@ -496,6 +524,7 @@
   "notification.own_poll": "Ваша апытанне скончылася",
   "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
   "notification.reblog": "{name} пашырыў ваш допіс",
+  "notification.reblog.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a> абагулілі ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
   "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
   "notification.relationships_severance_event.domain_block": "Адміністратар з {from} заблакіраваў {target}, у тым ліку {followersCount} вашых падпісчыка(-аў) і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}.",
@@ -525,6 +554,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-апавяшчэнні",
@@ -552,6 +582,7 @@
   "notifications.policy.accept_hint": "Паказваць у апавяшчэннях",
   "notifications.policy.drop": "Iгнараваць",
   "notifications.policy.filter": "Фільтраваць",
+  "notifications.policy.filter_limited_accounts_title": "Абмежаваныя ўліковыя запісы",
   "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
   "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
   "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
@@ -735,6 +766,7 @@
   "status.bookmark": "Дадаць закладку",
   "status.cancel_reblog_private": "Прыбраць",
   "status.cannot_reblog": "Гэты пост нельга пашырыць",
+  "status.continued_thread": "Працяг тэмы",
   "status.copy": "Скапіраваць спасылку на допіс",
   "status.delete": "Выдаліць",
   "status.detailed_status": "Дэтальны агляд размовы",
@@ -743,6 +775,7 @@
   "status.edit": "Рэдагаваць",
   "status.edited": "Апошняе рэдагаванне {date}",
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
+  "status.embed": "Атрымаць убудаваны код",
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
@@ -767,6 +800,7 @@
   "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
   "status.redraft": "Выдаліць і паправіць",
   "status.remove_bookmark": "Выдаліць закладку",
+  "status.replied_in_thread": "Адказаў у тэме",
   "status.replied_to": "Адказаў {name}",
   "status.reply": "Адказаць",
   "status.replyAll": "Адказаць у ланцугу",

app/javascript/mastodon/locales/bg.json

@@ -22,7 +22,7 @@
   "account.cancel_follow_request": "Оттегляне на заявката за последване",
   "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
-  "account.disable_notifications": "Сприране на известия при публикуване от @{name}",
+  "account.disable_notifications": "Спиране на известяване при публикуване от @{name}",
   "account.domain_blocked": "Блокиран домейн",
   "account.edit_profile": "Редактиране на профила",
   "account.enable_notifications": "Известяване при публикуване от @{name}",
@@ -89,7 +89,7 @@
   "announcement.announcement": "Оповестяване",
   "attachments_list.unprocessed": "(необработено)",
   "audio.hide": "Скриване на звука",
-  "block_modal.remote_users_caveat": "Ще поискаме сървърът {domain} да почита решението ви. Съгласието обаче не се гарантира откак някои сървъри могат да боравят с блоковете по различен начин. Обществените публикации още може да се виждат от невлезли в системата потребители.",
+  "block_modal.remote_users_caveat": "Ще приканим сървъра {domain} да уважава решението ви. За съжаление не можем да гарантираме това защото някои сървъри могат да третират блокиранията по различен начин. Публичните постове може да продължат да бъдат видими за потребители, които не са се регистрирали.",
   "block_modal.show_less": "Повече на показ",
   "block_modal.show_more": "По-малко на показ",
   "block_modal.they_cant_mention": "Те не могат да ви споменават или последват.",
@@ -120,7 +120,7 @@
   "column.about": "Относно",
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
-  "column.community": "Локален инфопоток",
+  "column.community": "Локална хронология",
   "column.direct": "Частни споменавания",
   "column.directory": "Разглеждане на профили",
   "column.domain_blocks": "Блокирани домейни",
@@ -132,7 +132,7 @@
   "column.mutes": "Заглушени потребители",
   "column.notifications": "Известия",
   "column.pins": "Закачени публикации",
-  "column.public": "Федериран инфопоток",
+  "column.public": "Федеративна хронология",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Скриване на настройките",
   "column_header.moveLeft_settings": "Преместване на колона вляво",
@@ -193,9 +193,11 @@
   "confirmations.reply.message": "Отговарянето сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.reply.title": "Презаписвате ли публикацията?",
   "confirmations.unfollow.confirm": "Без следване",
-  "confirmations.unfollow.message": "Наистина ли искате да не следвате {name}?",
+  "confirmations.unfollow.message": "Наистина ли искате вече да не следвате {name}?",
   "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
   "content_warning.hide": "Скриване на публ.",
+  "content_warning.show": "Нека се покаже",
+  "content_warning.show_more": "Показване на още",
   "conversation.delete": "Изтриване на разговора",
   "conversation.mark_as_read": "Маркиране като прочетено",
   "conversation.open": "Преглед на разговора",
@@ -211,7 +213,7 @@
   "disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
   "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
   "dismissable_banner.dismiss": "Отхвърляне",
-  "dismissable_banner.explore_links": "Това са най-споделяните новини в социалната мрежа днес. По-нови истории, споделени от повече хора се показват по-напред.",
+  "dismissable_banner.explore_links": "Има новинарски истории, които са най-споделяните в социалната мрежа днес. По-нови новинарски истории, публикувани от повече различни хора са класирани по-напред.",
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
@@ -221,18 +223,20 @@
   "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, говорещ с други социални мрежи.",
   "domain_pill.server": "Сървър",
-  "domain_pill.their_handle": "Тяхната ръчка:",
+  "domain_pill.their_handle": "Техният адрес:",
   "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
   "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "domain_pill.username": "Потребителско име",
-  "domain_pill.whats_in_a_handle": "Какво е в ръчката?",
+  "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_handle": "Вашият адрес:",
   "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
   "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
@@ -258,16 +262,16 @@
   "empty_column.account_unavailable": "Профилът не е наличен",
   "empty_column.blocks": "Още не сте блокирали никакви потребители.",
   "empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
-  "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
+  "empty_column.community": "Локалната хронология е празна. Напишете нещо публично, за да завъртите процеса!",
   "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
   "empty_column.domain_blocks": "Още няма блокирани домейни.",
-  "empty_column.explore_statuses": "Няма тенденции в момента. Проверете пак по-късно!",
+  "empty_column.explore_statuses": "Няма нищо популярно в момента. Проверете пак по-късно!",
   "empty_column.favourited_statuses": "Още нямате никакви любими публикации. Правейки любима, то тя ще се покаже тук.",
   "empty_column.favourites": "Още никого не е слагал публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
   "empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.",
   "empty_column.followed_tags": "Още не сте последвали никакви хаштагове. Последваните хаштагове ще се покажат тук.",
   "empty_column.hashtag": "Още няма нищо в този хаштаг.",
-  "empty_column.home": "Вашата начална часова ос е празна! Последвайте повече хора, за да я запълните. {suggestions}",
+  "empty_column.home": "Вашата начална хронология е празна! Последвайте повече хора, за да се запълни.",
   "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
   "empty_column.mutes": "Още не сте заглушавали потребители.",
@@ -302,6 +306,7 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
+  "filter_warning.matches_filter": "Съвпадащ филтър на “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
@@ -366,13 +371,24 @@
   "home.pending_critical_update.link": "Преглед на обновяванията",
   "home.pending_critical_update.title": "Налично критично обновяване на сигурността!",
   "home.show_announcements": "Показване на оповестяванията",
+  "ignore_notifications_modal.disclaimer": "Mastodon не може да осведоми потребители, че сте пренебрегнали известията им. Пренебрегването на известията няма да спре самите съобщения да не бъдат изпращани.",
+  "ignore_notifications_modal.filter_instead": "Вместо това филтриране",
+  "ignore_notifications_modal.filter_to_act_users": "Вие все още ще може да приемате, отхвърляте или докладвате потребители",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Прецеждането помага за избягване на възможно объркване",
+  "ignore_notifications_modal.filter_to_review_separately": "Може да разгледате отделно филтрираните известия",
+  "ignore_notifications_modal.ignore": "Пренебрегване на известията",
+  "ignore_notifications_modal.limited_accounts_title": "Пренебрегвате ли известията от модерирани акаунти?",
+  "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": "Имайки акаунт в Mastodon, може да сложите тази публикации в любими, за да позволите на автора да узнае, че я цените и да я запазите за по-късно.",
   "interaction_modal.description.follow": "С акаунт в Mastodon може да последвате {name}, за да получавате публикациите от този акаунт в началния си инфоканал.",
   "interaction_modal.description.reblog": "С акаунт в Mastodon може да подсилите тази публикация, за да я споделите с последователите си.",
   "interaction_modal.description.reply": "С акаунт в Mastodon може да добавите отговор към тази публикация.",
   "interaction_modal.login.action": "Към началото",
   "interaction_modal.login.prompt": "Домейнът на сървъра ви, примерно, mastodon.social",
-  "interaction_modal.no_account_yet": "Още не е в Мастодон?",
+  "interaction_modal.no_account_yet": "Още ли не сте в Mastodon?",
   "interaction_modal.on_another_server": "На различен сървър",
   "interaction_modal.on_this_server": "На този сървър",
   "interaction_modal.sign_in": "Не сте влезли в този сървър. Къде се хоства акаунтът ви?",
@@ -395,12 +411,12 @@
   "keyboard_shortcuts.enter": "Отваряне на публикация",
   "keyboard_shortcuts.favourite": "Любима публикация",
   "keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
-  "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
+  "keyboard_shortcuts.federated": "Отваряне на федералната хронология",
   "keyboard_shortcuts.heading": "Клавишни съчетания",
-  "keyboard_shortcuts.home": "Отваряне на личния инфопоток",
+  "keyboard_shortcuts.home": "Отваряне на началната хронология",
   "keyboard_shortcuts.hotkey": "Бърз клавиш",
   "keyboard_shortcuts.legend": "Показване на тази легенда",
-  "keyboard_shortcuts.local": "Отваряне на локалния инфопоток",
+  "keyboard_shortcuts.local": "Отваряне на локалната хронология",
   "keyboard_shortcuts.mention": "Споменаване на автора",
   "keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
   "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
@@ -421,6 +437,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}",
@@ -442,6 +460,7 @@
   "lists.subheading": "Вашите списъци",
   "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
   "loading_indicator.label": "Зареждане…",
+  "media_gallery.hide": "Скриване",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Скриване от известията",
   "mute_modal.hide_options": "Скриване на възможностите",
@@ -457,7 +476,7 @@
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локален инфопоток",
+  "navigation_bar.community_timeline": "Локална хронология",
   "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
@@ -490,7 +509,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": "Споменаване",
@@ -498,6 +517,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": "Някои от публикациите ви са премахнати.",
@@ -519,10 +539,15 @@
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
+  "notification_requests.accept_multiple": "{count, plural, one {Приемане на # заявка…} other {Приемане на # заявки…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Приемане на заявката} other {Приемане на заявките}}",
   "notification_requests.confirm_accept_multiple.message": "На път сте да приемете {count, plural, one {едно известие за заявка} other {# известия за заявки}}. Наистина ли искате да продължите?",
   "notification_requests.confirm_accept_multiple.title": "Приемате ли заявките за известие?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Отхвърляне на заявката} other {Отхвърляне на заявките}}",
+  "notification_requests.confirm_dismiss_multiple.message": "На път сте да отхвърлите {count, plural, one {една заявка за известие} other {# заявки за известие}}. Няма да имате лесен достъп до {count, plural, one {това лице} other {тях}} отново. Наистина ли искате да продължите?",
   "notification_requests.confirm_dismiss_multiple.title": "Отхвърляте ли заявките за известие?",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Отхвърляне на # заявка…} other {Отхвърляне на # заявки…}}",
   "notification_requests.edit_selection": "Редактиране",
   "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
@@ -543,6 +568,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": "Изскачащи известия",
@@ -568,7 +594,10 @@
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
   "notifications.policy.accept": "Приемам",
   "notifications.policy.accept_hint": "Показване в известия",
+  "notifications.policy.drop": "Пренебрегване",
+  "notifications.policy.drop_hint": "Изпращане в празнотата, за да не се видим никога пак",
   "notifications.policy.filter": "Филтър",
+  "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 {последните # дена}}",
@@ -588,7 +617,7 @@
   "onboarding.actions.go_to_explore": "Виж тенденции",
   "onboarding.actions.go_to_home": "Към началния ми инфоканал",
   "onboarding.compose.template": "Здравейте, #Mastodon!",
-  "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
+  "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате посредством търсене или сърфиране да разгледате страницата, за да намерите хора за последване, или опитайте пак по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
   "onboarding.follows.title": "Популярно в Mastodon",
   "onboarding.profile.discoverable": "Правене на моя профил откриваем",
@@ -596,7 +625,7 @@
   "onboarding.profile.display_name": "Името на показ",
   "onboarding.profile.display_name_hint": "Вашето пълно име или псевдоним…",
   "onboarding.profile.lead": "Винаги може да завършите това по-късно в настройките, където дори има повече възможности за настройване.",
-  "onboarding.profile.note": "Биогр.",
+  "onboarding.profile.note": "Биография",
   "onboarding.profile.note_hint": "Може да @споменавате други хора или #хаштагове…",
   "onboarding.profile.save_and_continue": "Запазване и продължаване",
   "onboarding.profile.title": "Настройване на профила",
@@ -613,7 +642,7 @@
   "onboarding.steps.follow_people.title": "Персонализиране на началния ви инфоканал",
   "onboarding.steps.publish_status.body": "Поздравете целия свят.",
   "onboarding.steps.publish_status.title": "Направете първата си публикация",
-  "onboarding.steps.setup_profile.body": "Други са по-вероятно да взаимодействат с вас с попълнения профил.",
+  "onboarding.steps.setup_profile.body": "Подсилете взаимодействията си, имайки изчерпателен профил.",
   "onboarding.steps.setup_profile.title": "Пригодете профила си",
   "onboarding.steps.share_profile.body": "Позволете на приятелите си да знаят как да ви намират в Mastodon!",
   "onboarding.steps.share_profile.title": "Споделяне на профила ви",
@@ -684,7 +713,7 @@
   "report.placeholder": "Допълнителни коментари",
   "report.reasons.dislike": "Не ми харесва",
   "report.reasons.dislike_description": "Не е нещо, което искате да виждате",
-  "report.reasons.legal": "Законово е",
+  "report.reasons.legal": "Незаконно е",
   "report.reasons.legal_description": "Смятате, че това нарушава закона на вашата страна или държавата на сървъра",
   "report.reasons.other": "Нещо друго е",
   "report.reasons.other_description": "Проблемът не попада в нито една от останалите категории",
@@ -722,7 +751,7 @@
   "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
   "search.search_or_paste": "Търсене/поставяне на URL",
-  "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
+  "search_popout.full_text_search_disabled_message": "Не е налично на {domain}.",
   "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
   "search_popout.options": "Възможности при търсене",
@@ -754,6 +783,7 @@
   "status.bookmark": "Отмятане",
   "status.cancel_reblog_private": "Край на подсилването",
   "status.cannot_reblog": "Публикацията не може да се подсилва",
+  "status.continued_thread": "Продължена нишка",
   "status.copy": "Копиране на връзката към публикация",
   "status.delete": "Изтриване",
   "status.detailed_status": "Подробен изглед на разговора",
@@ -762,6 +792,7 @@
   "status.edit": "Редактиране",
   "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
+  "status.embed": "Вземане на кода за вграждане",
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
@@ -786,6 +817,7 @@
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
   "status.redraft": "Изтриване и преработване",
   "status.remove_bookmark": "Премахване на отметката",
+  "status.replied_in_thread": "Отговорено в нишката",
   "status.replied_to": "В отговор до {name}",
   "status.reply": "Отговор",
   "status.replyAll": "Отговор на нишка",
@@ -801,9 +833,9 @@
   "status.uncached_media_warning": "Онагледяването не е налично",
   "status.unmute_conversation": "Без заглушаването на разговора",
   "status.unpin": "Разкачане от профила",
-  "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в списъка с часови оси след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
+  "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в хронологичните списъци след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
   "subscribed_languages.save": "Запазване на промените",
-  "subscribed_languages.target": "Смяна на езика за {target}",
+  "subscribed_languages.target": "Промяна на абонираните езици за {target}",
   "tabs_bar.home": "Начало",
   "tabs_bar.notifications": "Известия",
   "time_remaining.days": "{number, plural, one {остава # ден} other {остават # дни}}",
@@ -823,6 +855,11 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
+  "upload_form.drag_and_drop.instructions": "Натиснете интервал или enter, за да подберете мултимедийно прикачване. Провлачвайки, ползвайте клавишите със стрелки, за да премествате мултимедията във всяка дадена посока. Натиснете пак интервал или enter, за да се стовари мултимедийното прикачване в новото си положение или натиснете Esc за отмяна.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Провлачването е отменено. Мултимедийното прикачване {item} е спуснато.",
+  "upload_form.drag_and_drop.on_drag_end": "Мултимедийното прикачване {item} е спуснато.",
+  "upload_form.drag_and_drop.on_drag_over": "Мултимедийното прикачване {item} е преместено.",
+  "upload_form.drag_and_drop.on_drag_start": "Избрано мултимедийно прикачване {item}.",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",

app/javascript/mastodon/locales/bn.json

@@ -11,6 +11,7 @@
   "about.not_available": "এই তথ্য এই সার্ভারে উন্মুক্ত করা হয়নি.",
   "about.powered_by": "{mastodon} দ্বারা তৈরি বিকেন্দ্রীভূত সামাজিক মিডিয়া।",
   "about.rules": "সার্ভারের নিয়মাবলী",
+  "account.account_note_header": "ব্যক্তিগত টীকা",
   "account.add_or_remove_from_list": "তালিকাতে যোগ বা অপসারণ করো",
   "account.badges.bot": "বট",
   "account.badges.group": "দল",
@@ -19,6 +20,7 @@
   "account.block_short": "ব্লক",
   "account.blocked": "অবরুদ্ধ",
   "account.cancel_follow_request": "অনুসরণ অনুরোধ প্রত্যাহার করুন",
+  "account.copy": "অবতারের সংযোগ অনুলিপি করো",
   "account.direct": "গোপনে মেনশন করুন @{name}",
   "account.disable_notifications": "আমাকে জানানো বন্ধ করো যখন @{name} পোস্ট করবে",
   "account.domain_blocked": "ডোমেইন ব্লক করা",
@@ -29,6 +31,7 @@
   "account.featured_tags.last_status_never": "কোনো পোস্ট নেই",
   "account.featured_tags.title": "{name} এর ফিচার করা Hashtag সমূহ",
   "account.follow": "অনুসরণ",
+  "account.follow_back": "তাকে অনুসরণ করো",
   "account.followers": "অনুসরণকারী",
   "account.followers.empty": "এই ব্যক্তিকে এখনো কেউ অনুসরণ করে না.",
   "account.following": "অনুসরণ করা হচ্ছে",

app/javascript/mastodon/locales/br.json

@@ -161,9 +161,11 @@
   "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
+  "confirmations.delete_list.title": "Dilemel al listenn?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
   "confirmations.edit.confirm": "Kemmañ",
+  "confirmations.edit.message": "Kemmañ bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
   "confirmations.mute.confirm": "Kuzhat",
@@ -172,6 +174,7 @@
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
   "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
+  "content_warning.show_more": "Diskouez muioc'h",
   "conversation.delete": "Dilemel ar gaozeadenn",
   "conversation.mark_as_read": "Merkañ evel lennet",
   "conversation.open": "Gwelout ar gaozeadenn",
@@ -250,6 +253,7 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
+  "filter_warning.matches_filter": "A glot gant ar sil “<span>{title}</span>”",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",
@@ -385,12 +389,19 @@
   "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.label.reply": "Respont",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
   "notification.own_poll": "Echu eo ho sontadeg",
   "notification.reblog": "Gant {name} eo bet skignet ho toud",
+  "notification.relationships_severance_event.learn_more": "Gouzout hiroc'h",
   "notification.status": "Emañ {name} o paouez toudañ",
   "notification.update": "Gant {name} ez eus bet kemmet un toud",
+  "notification_requests.accept": "Asantiñ",
+  "notification_requests.dismiss": "Diverkañ",
+  "notification_requests.edit_selection": "Kemmañ",
+  "notification_requests.exit_selection": "Graet",
   "notifications.clear": "Skarzhañ ar c'hemennoù",
   "notifications.clear_confirmation": "Ha sur oc'h e fell deoc'h skarzhañ ho holl kemennoù ?",
   "notifications.column_settings.admin.report": "Disklêriadurioù nevez :",
@@ -399,6 +410,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",
@@ -422,6 +434,10 @@
   "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
   "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
   "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
+  "notifications.policy.accept": "Asantiñ",
+  "notifications.policy.accept_hint": "Diskouez er c’hemennoù",
+  "notifications.policy.drop": "Tremen e-bioù",
+  "notifications.policy.filter": "Silañ",
   "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",

app/javascript/mastodon/locales/ca.json

@@ -150,7 +150,7 @@
   "compose.published.open": "Obre",
   "compose.saved.body": "Tut desat.",
   "compose_form.direct_message_warning_learn_more": "Més informació",
-  "compose_form.encryption_warning": "Les publicacions a Mastodon no estant xifrades punt a punt. No comparteixis informació sensible mitjançant Mastodon.",
+  "compose_form.encryption_warning": "Els tuts a Mastodon no estan xifrats punt a punt. No compartiu informació confidencial mitjançant Mastodon.",
   "compose_form.hashtag_warning": "Aquest tut no apareixerà a les llistes d'etiquetes perquè no és públic. Només els tuts públics apareixen a les cerques per etiqueta.",
   "compose_form.lock_disclaimer": "El teu compte no està {locked}. Tothom pot seguir-te i veure els tuts de només per a seguidors.",
   "compose_form.lock_disclaimer.lock": "blocat",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
   "content_warning.hide": "Amaga la publicació",
   "content_warning.show": "Mostra-la igualment",
+  "content_warning.show_more": "Mostra'n més",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
@@ -508,7 +509,7 @@
   "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.name_and_others": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> 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 +517,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.",
@@ -566,6 +568,7 @@
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
+  "notifications.column_settings.group": "Agrupa",
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",
@@ -612,11 +615,11 @@
   "onboarding.action.back": "Porta'm enrere",
   "onboarding.actions.back": "Porta'm enrere",
   "onboarding.actions.go_to_explore": "Mira què és tendència",
-  "onboarding.actions.go_to_home": "Ves a la teva línia de temps",
+  "onboarding.actions.go_to_home": "Aneu a la vostra pantalla d'inici",
   "onboarding.compose.template": "Hola Mastodon!",
   "onboarding.follows.empty": "Malauradament, cap resultat pot ser mostrat ara mateix. Pots provar de fer servir la cerca o visitar la pàgina Explora per a trobar gent a qui seguir o provar-ho de nou més tard.",
-  "onboarding.follows.lead": "La teva línia de temps inici només està a les teves mans. Com més gent segueixis, més activa i interessant serà. Aquests perfils poden ser un bon punt d'inici—sempre pots acabar deixant de seguir-los!:",
+  "onboarding.follows.lead": "La vostra pantalla d'inici és la manera principal d'experimentar Mastodon. Com més gent seguiu, més activa i interessant serà. Per a començar, alguns suggeriments:",
-  "onboarding.follows.title": "Personalitza la pantalla d'inci",
+  "onboarding.follows.title": "Personalitzeu la pantalla d'inci",
   "onboarding.profile.discoverable": "Fes el meu perfil descobrible",
   "onboarding.profile.discoverable_hint": "En acceptar d'ésser descobert a Mastodon els teus missatges poden aparèixer dins les tendències i els resultats de cerques, i el teu perfil es pot suggerir a qui tingui interessos semblants als teus.",
   "onboarding.profile.display_name": "Nom que es mostrarà",
@@ -636,7 +639,7 @@
   "onboarding.start.skip": "Vols saltar-te tota la resta?",
   "onboarding.start.title": "Llestos!",
   "onboarding.steps.follow_people.body": "Mastodon va de seguir a gent interessant.",
-  "onboarding.steps.follow_people.title": "Personalitza la pantalla d'inci",
+  "onboarding.steps.follow_people.title": "Personalitzeu la pantalla d'inici",
   "onboarding.steps.publish_status.body": "Saluda al món amb text, fotos, vídeos o enquestes {emoji}",
   "onboarding.steps.publish_status.title": "Fes el teu primer tut",
   "onboarding.steps.setup_profile.body": "És més fàcil que altres interactuïn amb tu si tens un perfil complet.",
@@ -671,11 +674,11 @@
   "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
   "privacy.unlisted.short": "Públic silenciós",
   "privacy_policy.last_updated": "Darrera actualització {date}",
-  "privacy_policy.title": "Política de Privacitat",
+  "privacy_policy.title": "Política de privadesa",
   "recommended": "Recomanat",
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
-  "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
+  "regeneration_indicator.sublabel": "Es prepara la vostra pantalla d'Inici!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",

app/javascript/mastodon/locales/cs.json

@@ -85,10 +85,11 @@
   "alert.rate_limited.title": "Spojení omezena",
   "alert.unexpected.message": "Objevila se neočekávaná chyba.",
   "alert.unexpected.title": "Jejda!",
+  "alt_text_badge.title": "Popisek",
   "announcement.announcement": "Oznámení",
   "attachments_list.unprocessed": "(nezpracováno)",
   "audio.hide": "Skrýt zvuk",
-  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou stále být viditelné pro nepřihlášené uživatele.",
+  "block_modal.remote_users_caveat": "Požádáme server {domain}, aby respektoval vaše rozhodnutí. Úplné dodržování nastavení však není zaručeno, protože některé servery mohou řešit blokování různě. Veřejné příspěvky mohou být stále viditelné pro nepřihlášené uživatele.",
   "block_modal.show_less": "Zobrazit méně",
   "block_modal.show_more": "Zobrazit více",
   "block_modal.they_cant_mention": "Nemůže vás zmiňovat ani sledovat.",
@@ -195,6 +196,8 @@
   "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
   "confirmations.unfollow.title": "Přestat sledovat uživatele?",
   "content_warning.hide": "Skrýt příspěvek",
+  "content_warning.show": "Přesto zobrazit",
+  "content_warning.show_more": "Zobrazit více",
   "conversation.delete": "Smazat konverzaci",
   "conversation.mark_as_read": "Označit jako přečtené",
   "conversation.open": "Zobrazit konverzaci",
@@ -220,17 +223,19 @@
   "domain_block_modal.they_cant_follow": "Nikdo z tohoto serveru vás nemůže sledovat.",
   "domain_block_modal.they_wont_know": "Nebude vědět, že je zablokován*a.",
   "domain_block_modal.title": "Blokovat doménu?",
+  "domain_block_modal.you_will_lose_num_followers": "Ztratíte {followersCount, plural, one {{followersCountDisplay} sledujícího} few {{followersCountDisplay} sledující} many {{followersCountDisplay} sledujících} other {{followersCountDisplay} sledujících}} a {followingCount, plural, one {{followingCountDisplay} sledovaného} few {{followingCountDisplay} sledované} many {{followingCountDisplay} sledovaných} other {{followingCountDisplay} sledovaných}}.",
+  "domain_block_modal.you_will_lose_relationships": "Ztratíte všechny sledující a sledované z tohoto serveru.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
-  "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i s dalšími sociálními aplikacemi.",
+  "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i na jiných sociálních aplikacích.",
   "domain_pill.activitypub_like_language": "ActivityPub je jako jazyk, kterým Mastodon mluví s jinými sociálními sítěmi.",
   "domain_pill.server": "Server",
   "domain_pill.their_handle": "Handle:",
-  "domain_pill.their_server": "Digitální domov, kde žijí všechny příspěvky.",
+  "domain_pill.their_server": "Jejich digitální domov, kde žijí jejich všechny příspěvky.",
-  "domain_pill.their_username": "Jedinečný identikátor na serveru. Je možné najít uživatele se stejným uživatelským jménem na různých serverech.",
+  "domain_pill.their_username": "Jejich jedinečný identifikátor na jejich serveru. Je možné, že na jiných serverech jsou uživatelé se stejným uživatelským jménem.",
   "domain_pill.username": "Uživatelské jméno",
   "domain_pill.whats_in_a_handle": "Co obsahuje handle?",
-  "domain_pill.who_they_are": "Protože handle říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.who_they_are": "Protože handly říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálním webem, skládajícím se z <button>platforem postavených na ActivityPub</button>.",
-  "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou lidé komunikovat napříč sociálními weby <button>platforem postavených na ActivityPub</button>.",
+  "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou komunikovat lidé napříč sociálním webem, skládajícím se z <button>platforem postavených na ActivityPub</button>.",
   "domain_pill.your_handle": "Tvůj handle:",
   "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
   "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
@@ -251,7 +256,7 @@
   "emoji_button.search_results": "Výsledky hledání",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestování a místa",
-  "empty_column.account_hides_collections": "Tento uživatel se rozhodl nezveřejňovat tuto informaci",
+  "empty_column.account_hides_collections": "Tento uživatel se rozhodl tuto informaci nezveřejňovat",
   "empty_column.account_suspended": "Účet je pozastaven",
   "empty_column.account_timeline": "Nejsou tu žádné příspěvky!",
   "empty_column.account_unavailable": "Profil není dostupný",
@@ -301,6 +306,8 @@
   "filter_modal.select_filter.subtitle": "Použít existující kategorii nebo vytvořit novou kategorii",
   "filter_modal.select_filter.title": "Filtrovat tento příspěvek",
   "filter_modal.title.status": "Filtrovat příspěvek",
+  "filter_warning.matches_filter": "Odpovídá filtru “<span>{title}</span>”",
+  "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {nikoho, koho možná znáte} one {člověka, kterého možná znáte} few {#, které možná znáte} many {#, které možná znáte} other {#, které možná znáte}}",
   "filtered_notifications_banner.title": "Filtrovaná oznámení",
   "firehose.all": "Vše",
   "firehose.local": "Tento server",
@@ -308,14 +315,14 @@
   "follow_request.authorize": "Autorizovat",
   "follow_request.reject": "Zamítnout",
   "follow_requests.unlocked_explanation": "Přestože váš účet není uzamčen, personál {domain} usoudil, že byste mohli chtít tyto požadavky na sledování zkontrolovat ručně.",
-  "follow_suggestions.curated_suggestion": "Výběr personálů",
+  "follow_suggestions.curated_suggestion": "Výběr personálu",
   "follow_suggestions.dismiss": "Znovu nezobrazovat",
   "follow_suggestions.featured_longer": "Ručně vybráno týmem {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populární mezi lidmi, které sledujete",
   "follow_suggestions.hints.featured": "Tento profil byl ručně vybrán týmem {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Tento profil je populární mezi lidmi, které sledujete.",
-  "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejvíce sledovaných na {domain}.",
+  "follow_suggestions.hints.most_followed": "Tento profil je jedním z nejsledovanějších na {domain}.",
-  "follow_suggestions.hints.most_interactions": "Tento profil nedávno dostalo velkou pozornost na {domain}.",
+  "follow_suggestions.hints.most_interactions": "Tomuto profilu se nedávno dostalo velké pozornosti na {domain}.",
   "follow_suggestions.hints.similar_to_recently_followed": "Tento profil je podobný profilům, které jste nedávno sledovali.",
   "follow_suggestions.personalized_suggestion": "Přizpůsobený návrh",
   "follow_suggestions.popular_suggestion": "Populární návrh",
@@ -349,6 +356,14 @@
   "hashtag.follow": "Sledovat hashtag",
   "hashtag.unfollow": "Přestat sledovat hashtag",
   "hashtags.and_other": "…a {count, plural, one {# další} few {# další} other {# dalších}}",
+  "hints.profiles.followers_may_be_missing": "Sledující mohou pro tento profil chybět.",
+  "hints.profiles.follows_may_be_missing": "Sledování mohou pro tento profil chybět.",
+  "hints.profiles.posts_may_be_missing": "Některé příspěvky z tohoto profilu mohou chybět.",
+  "hints.profiles.see_more_followers": "Zobrazit více sledujících na {domain}",
+  "hints.profiles.see_more_follows": "Zobrazit další sledování na {domain}",
+  "hints.profiles.see_more_posts": "Zobrazit další příspěvky na {domain}",
+  "hints.threads.replies_may_be_missing": "Odpovědi z jiných serverů mohou chybět.",
+  "hints.threads.see_more": "Zobrazit další odpovědi na {domain}",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
   "home.hide_announcements": "Skrýt oznámení",
@@ -356,6 +371,17 @@
   "home.pending_critical_update.link": "Zobrazit aktualizace",
   "home.pending_critical_update.title": "K dispozici je kritická bezpečnostní aktualizace!",
   "home.show_announcements": "Zobrazit oznámení",
+  "ignore_notifications_modal.disclaimer": "Mastodon nemůže informovat uživatele, že jste ignorovali jejich oznámení. Ignorování oznámení nezabrání odesílání zpráv samotných.",
+  "ignore_notifications_modal.filter_instead": "Místo toho filtrovat",
+  "ignore_notifications_modal.filter_to_act_users": "Stále budete moci přijmout, odmítnout nebo nahlásit uživatele",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrování pomáhá vyhnout se možným nejasnostem",
+  "ignore_notifications_modal.filter_to_review_separately": "Filtrovaná oznámení můžete zkontrolovat samostatně",
+  "ignore_notifications_modal.ignore": "Ignorovat oznámení",
+  "ignore_notifications_modal.limited_accounts_title": "Ignorovat oznámení z moderovaných účtů?",
+  "ignore_notifications_modal.new_accounts_title": "Ignorovat oznámení z nových účtů?",
+  "ignore_notifications_modal.not_followers_title": "Ignorovat oznámení od lidí, kteří vás nesledují?",
+  "ignore_notifications_modal.not_following_title": "Ignorovat oznámení od lidí, které nesledujete?",
+  "ignore_notifications_modal.private_mentions_title": "Ignorovat oznámení z nevyžádaných soukromých zmínek?",
   "interaction_modal.description.favourite": "Pokud máte účet na Mastodonu, můžete tento příspěvek označit jako oblíbený a dát tak autorovi najevo, že si ho vážíte, a uložit si ho na později.",
   "interaction_modal.description.follow": "S účtem na Mastodonu můžete sledovat uživatele {name} a přijímat příspěvky ve vašem domovském kanálu.",
   "interaction_modal.description.reblog": "S účtem na Mastodonu můžete boostnout tento příspěvek a sdílet jej s vlastními sledujícími.",
@@ -411,6 +437,8 @@
   "lightbox.close": "Zavřít",
   "lightbox.next": "Další",
   "lightbox.previous": "Předchozí",
+  "lightbox.zoom_in": "Přiblížit na skutečnou velikost",
+  "lightbox.zoom_out": "Přizpůsobit velikost",
   "limited_account_hint.action": "Přesto profil zobrazit",
   "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.",
   "link_preview.author": "Podle {name}",
@@ -432,10 +460,11 @@
   "lists.subheading": "Vaše seznamy",
   "load_pending": "{count, plural, one {# nová položka} few {# nové položky} many {# nových položek} other {# nových položek}}",
   "loading_indicator.label": "Načítání…",
+  "media_gallery.hide": "Skrýt",
   "moved_to_account_banner.text": "Váš účet {disabledAccount} je momentálně deaktivován, protože jste se přesunul/a na {movedToAccount}.",
-  "mute_modal.hide_from_notifications": "Skrýt z notifikací",
+  "mute_modal.hide_from_notifications": "Skrýt z oznámení",
   "mute_modal.hide_options": "Skrýt možnosti",
-  "mute_modal.indefinite": "Dokud je neodkryju",
+  "mute_modal.indefinite": "Dokud je neodeberu ze ztišených",
   "mute_modal.show_options": "Zobrazit možnosti",
   "mute_modal.they_can_mention_and_follow": "Mohou vás zmínit a sledovat, ale neuvidíte je.",
   "mute_modal.they_wont_know": "Nebudou vědět, že byli skryti.",
@@ -443,7 +472,8 @@
   "mute_modal.you_wont_see_mentions": "Neuvidíte příspěvky, které je zmiňují.",
   "mute_modal.you_wont_see_posts": "Stále budou moci vidět vaše příspěvky, ale vy jejich neuvidíte.",
   "navigation_bar.about": "O aplikaci",
-  "navigation_bar.advanced_interface": "Otevřít pokročilé webové rozhraní",
+  "navigation_bar.administration": "Administrace",
+  "navigation_bar.advanced_interface": "Otevřít v pokročilém webovém rozhraní",
   "navigation_bar.blocks": "Blokovaní uživatelé",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.community_timeline": "Místní časová osa",
@@ -459,6 +489,7 @@
   "navigation_bar.follows_and_followers": "Sledovaní a sledující",
   "navigation_bar.lists": "Seznamy",
   "navigation_bar.logout": "Odhlásit se",
+  "navigation_bar.moderation": "Moderace",
   "navigation_bar.mutes": "Skrytí uživatelé",
   "navigation_bar.opened_in_classic_interface": "Příspěvky, účty a další specifické stránky jsou ve výchozím nastavení otevřeny v klasickém webovém rozhraní.",
   "navigation_bar.personal": "Osobní",
@@ -469,24 +500,37 @@
   "navigation_bar.security": "Zabezpečení",
   "not_signed_in_indicator.not_signed_in": "Pro přístup k tomuto zdroji se musíte přihlásit.",
   "notification.admin.report": "Uživatel {name} nahlásil {target}",
-  "notification.admin.report_statuses": "{name} nahlásil {target} za {category}",
+  "notification.admin.report_account": "{name} nahlásil {count, plural, one {jeden příspěvek} few {# příspěvky} many {# příspěvků} other {# příspěvků}} od {target} za {category}",
-  "notification.admin.report_statuses_other": "{name} nahlásil {target}",
+  "notification.admin.report_account_other": "{name} nahlásil {count, plural, one {jeden příspěvek} few {# příspěvky} many {# příspěvků} other {# příspěvků}} od {target}",
+  "notification.admin.report_statuses": "{name} nahlásili {target} za {category}",
+  "notification.admin.report_statuses_other": "{name} nahlásili {target}",
   "notification.admin.sign_up": "Uživatel {name} se zaregistroval",
-  "notification.favourite": "Uživatel {name} si oblíbil váš příspěvek",
+  "notification.admin.sign_up.name_and_others": "{name} a {count, plural, one {# další} few {# další} many {# dalších} other {# dalších}} se zaregistrovali",
+  "notification.favourite": "{name} si oblíbil*a váš příspěvek",
+  "notification.favourite.name_and_others_with_link": "{name} a {count, plural, one {<a># další</a> si oblíbil} few {<a># další</a> si oblíbili} other {<a># dalších</a> si oblíbilo}} Váš příspěvek",
   "notification.follow": "Uživatel {name} vás začal sledovat",
+  "notification.follow.name_and_others": "{name} a {count, plural, one {<a># další</a> Vás začal sledovat} few {<a># další</a> Vás začali sledovat} other {<a># dalších</a> Vás začalo sledovat}}",
   "notification.follow_request": "Uživatel {name} požádal o povolení vás sledovat",
+  "notification.follow_request.name_and_others": "{name} a {count, plural, one {# další Vám poslal žádost o sledování} few {# další Vám poslali žádost o sledování} other {# dalších Vám poslalo žádost o sledování}}",
+  "notification.label.mention": "Zmínka",
+  "notification.label.private_mention": "Soukromá zmínka",
+  "notification.label.private_reply": "Privátní odpověď",
+  "notification.label.reply": "Odpověď",
+  "notification.mention": "Zmínka",
+  "notification.mentioned_you": "{name} vás zmínil",
   "notification.moderation-warning.learn_more": "Zjistit více",
-  "notification.moderation_warning": "Obdrželi jste moderační varování",
+  "notification.moderation_warning": "Obdrželi jste varování od moderátorů",
   "notification.moderation_warning.action_delete_statuses": "Některé z vašich příspěvků byly odstraněny.",
   "notification.moderation_warning.action_disable": "Váš účet je zablokován.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Některé z vašich příspěvků byly označeny jako citlivé.",
-  "notification.moderation_warning.action_none": "Váš účet obdržel moderační varování.",
+  "notification.moderation_warning.action_none": "Váš účet obdržel varování od moderátorů.",
   "notification.moderation_warning.action_sensitive": "Vaše příspěvky budou od nynějška označeny jako citlivé.",
   "notification.moderation_warning.action_silence": "Váš účet byl omezen.",
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
+  "notification.reblog.name_and_others_with_link": "{name} a {count, plural, one {<a># další</a> boostnul} few {<a># další</a> boostnuli} other {<a># dalších</a> boostnulo}} Váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
   "notification.relationships_severance_event.account_suspension": "Administrátor z {from} pozastavil {target}, což znamená, že již od nich nemůžete přijímat aktualizace nebo s nimi interagovat.",
   "notification.relationships_severance_event.domain_block": "Administrátor z {from} pozastavil {target}, včetně {followersCount} z vašich sledujících a {followingCount, plural, one {# účet, který sledujete} few {# účty, které sledujete} many {# účtů, které sledujete} other {# účtů, které sledujete}}.",
@@ -495,11 +539,24 @@
   "notification.status": "Uživatel {name} právě přidal příspěvek",
   "notification.update": "Uživatel {name} upravil příspěvek",
   "notification_requests.accept": "Přijmout",
+  "notification_requests.accept_multiple": "{count, plural, one {Schválit # požadavek…} few {Schválit # požadavky…} other {Schválit # požadavků…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Schválit požadavek} other {Schválit požadavky}}",
+  "notification_requests.confirm_accept_multiple.message": "Chystáte se schválit {count, plural, one {jeden požadavek} few {# požadavky} other {# požadavků}} na oznámení. Opravdu chcete pokračovat?",
+  "notification_requests.confirm_accept_multiple.title": "Přijmout žádosti o oznámení?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Zamítnout požadavek} other {Zamítnout požadavky}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Chystáte se zamítnout {count, plural, one {jeden požadavek} few {# požadavky} many {# požadavků} other {# požadavků}} na oznámení. Poté k {count, plural, one {němu} other {něm}} již nebudete mít snadný přístup. Opravdu chcete pokračovat?",
+  "notification_requests.confirm_dismiss_multiple.title": "Zamítnout požadavky na oznámení?",
   "notification_requests.dismiss": "Zamítnout",
+  "notification_requests.dismiss_multiple": "Zamítnout {count, plural, one {# požadavek} few {# požadavky} many {# požadavků} other {# požadavků}}…",
+  "notification_requests.edit_selection": "Upravit",
+  "notification_requests.exit_selection": "Hotovo",
+  "notification_requests.explainer_for_limited_account": "Oznámení z tohoto účtu byla filtrována, protože tento účet byl omezen moderátorem.",
+  "notification_requests.explainer_for_limited_remote_account": "Oznámení z tohoto účtu byla filtrována, protože tento účet nebo jeho server byl omezen moderátorem.",
   "notification_requests.maximize": "Maximalizovat",
   "notification_requests.minimize_banner": "Minimalizovat banner filtrovaných oznámení",
   "notification_requests.notifications_from": "Oznámení od {name}",
-  "notification_requests.title": "Vyfiltrovaná oznámení",
+  "notification_requests.title": "Filtrovaná oznámení",
+  "notification_requests.view": "Zobrazit oznámení",
   "notifications.clear": "Vyčistit oznámení",
   "notifications.clear_confirmation": "Opravdu chcete trvale smazat všechna vaše oznámení?",
   "notifications.clear_title": "Vyčistit oznámení?",
@@ -511,6 +568,7 @@
   "notifications.column_settings.filter_bar.category": "Panel rychlého filtrování",
   "notifications.column_settings.follow": "Noví sledující:",
   "notifications.column_settings.follow_request": "Nové žádosti o sledování:",
+  "notifications.column_settings.group": "Skupina",
   "notifications.column_settings.mention": "Zmínky:",
   "notifications.column_settings.poll": "Výsledky anket:",
   "notifications.column_settings.push": "Push oznámení",
@@ -534,6 +592,14 @@
   "notifications.permission_denied": "Oznámení na ploše nejsou k dispozici, protože byla zamítnuta žádost o oprávnění je zobrazovat",
   "notifications.permission_denied_alert": "Oznámení na ploše není možné zapnout, protože oprávnění bylo v minulosti zamítnuto",
   "notifications.permission_required": "Oznámení na ploše nejsou k dispozici, protože nebylo uděleno potřebné oprávnění.",
+  "notifications.policy.accept": "Přijmout",
+  "notifications.policy.accept_hint": "Zobrazit v oznámeních",
+  "notifications.policy.drop": "Ignorovat",
+  "notifications.policy.drop_hint": "Permanentně odstranit, aby již nikdy nespatřil světlo světa",
+  "notifications.policy.filter": "Filtrovat",
+  "notifications.policy.filter_hint": "Odeslat do filtrované schránky oznámení",
+  "notifications.policy.filter_limited_accounts_hint": "Omezeno moderátory serveru",
+  "notifications.policy.filter_limited_accounts_title": "Moderované účty",
   "notifications.policy.filter_new_accounts.hint": "Vytvořeno během {days, plural, one {včerejška} few {posledních # dnů} many {posledních # dní} other {posledních # dní}}",
   "notifications.policy.filter_new_accounts_title": "Nové účty",
   "notifications.policy.filter_not_followers_hint": "Včetně lidí, kteří vás sledovali méně než {days, plural, one {jeden den} few {# dny} many {# dní} other {# dní}}",
@@ -542,6 +608,7 @@
   "notifications.policy.filter_not_following_title": "Lidé, které nesledujete",
   "notifications.policy.filter_private_mentions_hint": "Vyfiltrováno, pokud to není odpověď na vaši zmínku nebo pokud sledujete odesílatele",
   "notifications.policy.filter_private_mentions_title": "Nevyžádané soukromé zmínky",
+  "notifications.policy.title": "Spravovat oznámení od…",
   "notifications_permission_banner.enable": "Povolit oznámení na ploše",
   "notifications_permission_banner.how_to_control": "Chcete-li dostávat oznámení, i když nemáte Mastodon otevřený, povolte oznámení na ploše. Můžete si zvolit, o kterých druzích interakcí chcete být oznámením na ploše informování pod tlačítkem {icon} výše.",
   "notifications_permission_banner.title": "Nenechte si nic uniknout",
@@ -550,7 +617,7 @@
   "onboarding.actions.go_to_explore": "Podívejte se, co je populární",
   "onboarding.actions.go_to_home": "Přejít na svůj domovský feed",
   "onboarding.compose.template": "Ahoj #Mastodon!",
-  "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit vyhledat nebo procházet stránku s průzkumem a najít lidi, kteří budou sledovat, nebo to zkuste znovu později.",
+  "onboarding.follows.empty": "Bohužel, žádné výsledky nelze momentálně zobrazit. Můžete zkusit najít uživatele ke sledování za pomocí vyhledávání nebo na stránce „Objevit“, nebo to zkuste znovu později.",
   "onboarding.follows.lead": "Domovský kanál je hlavní metodou zažívání Mastodonu. Čím více lidí sledujete, tím aktivnější a zajímavější bude. Pro začnutí, zde máte několik návrhů:",
   "onboarding.follows.title": "Přispůsobit vlastní domovský kanál",
   "onboarding.profile.discoverable": "Udělat svůj profil vyhledatelným",
@@ -674,7 +741,7 @@
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "spam",
   "report_notification.categories.violation": "Porušení pravidla",
-  "report_notification.categories.violation_sentence": "porušení pravidla",
+  "report_notification.categories.violation_sentence": "porušení pravidel",
   "report_notification.open": "Otevřít hlášení",
   "search.no_recent_searches": "Žádná nedávná vyhledávání",
   "search.placeholder": "Hledat",
@@ -716,6 +783,7 @@
   "status.bookmark": "Přidat do záložek",
   "status.cancel_reblog_private": "Zrušit boostnutí",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
+  "status.continued_thread": "Pokračuje ve vlákně",
   "status.copy": "Zkopírovat odkaz na příspěvek",
   "status.delete": "Smazat",
   "status.detailed_status": "Podrobné zobrazení konverzace",
@@ -724,6 +792,7 @@
   "status.edit": "Upravit",
   "status.edited": "Naposledy upraveno {date}",
   "status.edited_x_times": "Upraveno {count, plural, one {{count}krát} few {{count}krát} many {{count}krát} other {{count}krát}}",
+  "status.embed": "Získejte kód pro vložení",
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
@@ -748,6 +817,7 @@
   "status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
   "status.redraft": "Smazat a přepsat",
   "status.remove_bookmark": "Odstranit ze záložek",
+  "status.replied_in_thread": "Odpověděli ve vlákně",
   "status.replied_to": "Odpověděl/a uživateli {name}",
   "status.reply": "Odpovědět",
   "status.replyAll": "Odpovědět na vlákno",
@@ -785,6 +855,11 @@
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
   "upload_form.audio_description": "Popis pro sluchově postižené",
   "upload_form.description": "Popis pro zrakově postižené",
+  "upload_form.drag_and_drop.instructions": "Chcete-li zvednout přílohu, stiskněte mezerník nebo enter. Při přetažení použijte klávesnicové šipky k přesunutí mediální přílohy v libovolném směru. Stiskněte mezerník nebo enter pro vložení přílohy do nové pozice, nebo stiskněte Esc pro ukončení.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Přetažení bylo zrušeno. Příloha {item} byla vrácena.",
+  "upload_form.drag_and_drop.on_drag_end": "Příloha {item} byla vrácena.",
+  "upload_form.drag_and_drop.on_drag_over": "Příloha {item} byla přesunuta.",
+  "upload_form.drag_and_drop.on_drag_start": "Zvednuta příloha {item}.",
   "upload_form.edit": "Upravit",
   "upload_form.thumbnail": "Změnit miniaturu",
   "upload_form.video_description": "Popis pro sluchově či zrakově postižené",

app/javascript/mastodon/locales/cy.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Gweinyddion gyda chymedrolwyr",
+  "about.blocks": "Gweinyddion wedi'u cymedroli",
   "about.contact": "Cysylltwch â:",
   "about.disclaimer": "Mae Mastodon yn feddalwedd cod agored rhydd ac o dan hawlfraint Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Nid yw'r rheswm ar gael",
@@ -13,35 +13,35 @@
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn personol",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Awtomataidd",
   "account.badges.group": "Grŵp",
   "account.block": "Blocio @{name}",
-  "account.block_domain": "Blocio parth {domain}",
+  "account.block_domain": "Blocio'r parth {domain}",
   "account.block_short": "Blocio",
   "account.blocked": "Blociwyd",
   "account.cancel_follow_request": "Tynnu cais i ddilyn",
   "account.copy": "Copïo dolen i'r proffil",
   "account.direct": "Crybwyll yn breifat @{name}",
   "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
-  "account.domain_blocked": "Parth wedi ei flocio",
+  "account.domain_blocked": "Parth wedi'i rwystro",
   "account.edit_profile": "Golygu proffil",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
-  "account.featured_tags.last_status_at": "Y postiad diwethaf ar {date}",
+  "account.featured_tags.last_status_at": "Y postiad olaf ar {date}",
   "account.featured_tags.last_status_never": "Dim postiadau",
   "account.featured_tags.title": "Prif hashnodau {name}",
   "account.follow": "Dilyn",
-  "account.follow_back": "Dilyn yn ôl",
+  "account.follow_back": "Dilyn nôl",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
   "account.following": "Yn dilyn",
-  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter}}}",
+  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter} arall}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
   "account.in_memoriam": "Er Cof.",
-  "account.joined_short": "Wedi Ymuno",
+  "account.joined_short": "Ymunodd",
   "account.languages": "Newid ieithoedd wedi tanysgrifio iddyn nhw",
   "account.link_verified_on": "Gwiriwyd perchnogaeth y ddolen yma ar {date}",
   "account.locked_info": "Mae'r statws preifatrwydd cyfrif hwn wedi'i osod i fod ar glo. Mae'r perchennog yn adolygu'r sawl sy'n gallu eu dilyn.",
@@ -56,16 +56,16 @@
   "account.no_bio": "Dim disgrifiad wedi'i gynnig.",
   "account.open_original_page": "Agor y dudalen wreiddiol",
   "account.posts": "Postiadau",
-  "account.posts_with_replies": "Postiadau ac atebion",
+  "account.posts_with_replies": "Postiadau ac ymatebion",
   "account.report": "Adrodd @{name}",
   "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "account.share": "Rhannwch broffil @{name}",
+  "account.share": "Rhannu proffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
+  "account.statuses_counter": "{count, plural, one {{counter} postiad} two {{counter} bostiad} few {{counter} phostiad} many {{counter} postiad} other {{counter} postiad}}",
-  "account.unblock": "Dadflocio @{name}",
+  "account.unblock": "Dadrwystro @{name}",
-  "account.unblock_domain": "Dadflocio parth {domain}",
+  "account.unblock_domain": "Dadrwystro parth {domain}",
-  "account.unblock_short": "Dadflocio",
+  "account.unblock_short": "Dadrwystro",
   "account.unendorse": "Peidio a'i ddangos ar fy mhroffil",
   "account.unfollow": "Dad-ddilyn",
   "account.unmute": "Dad-dewi {name}",
@@ -85,28 +85,29 @@
   "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",
   "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystro mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
   "block_modal.show_less": "Dangos llai",
-  "block_modal.show_more": "Dangos mwy",
+  "block_modal.show_more": "Dangos rhagor",
-  "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
+  "block_modal.they_cant_mention": "Dydyn nhw ddim yn gallu eich crybwyll na'ch dilyn.",
-  "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
+  "block_modal.they_cant_see_posts": "Dydyn nhw ddim yn gallu gweld eich postiadau a fyddwch chi ddim yn gweld eu rhai nhw.",
-  "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
+  "block_modal.they_will_know": "Gallan nhw weld eu bod wedi'u rhwystro.",
   "block_modal.title": "Blocio defnyddiwr?",
   "block_modal.you_wont_see_mentions": "Fyddwch chi ddim yn gweld postiadau sy'n sôn amdanyn nhw.",
   "boost_modal.combo": "Mae modd pwyso {combo} er mwyn hepgor hyn tro nesa",
   "boost_modal.reblog": "Hybu postiad?",
   "boost_modal.undo_reblog": "Dad-hybu postiad?",
   "bundle_column_error.copy_stacktrace": "Copïo'r adroddiad gwall",
-  "bundle_column_error.error.body": "Nid oedd modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
+  "bundle_column_error.error.body": "Does dim modd cynhyrchu'r dudalen honno. Gall fod oherwydd gwall yn ein cod neu fater cydnawsedd porwr.",
   "bundle_column_error.error.title": "O na!",
   "bundle_column_error.network.body": "Bu gwall wrth geisio llwytho'r dudalen hon. Gall hyn fod oherwydd anhawster dros-dro gyda'ch cysylltiad gwe neu'r gweinydd hwn.",
   "bundle_column_error.network.title": "Gwall rhwydwaith",
   "bundle_column_error.retry": "Ceisiwch eto",
   "bundle_column_error.return": "Mynd i'r ffrwd gartref",
-  "bundle_column_error.routing.body": "Nid oedd modd canfod y dudalen honno. Ydych chi'n siŵr fod yr URL yn y bar cyfeiriad yn gywir?",
+  "bundle_column_error.routing.body": "Doedd dim modd canfod y dudalen honno. Ydych chi'n siŵr fod yr URL yn y bar cyfeiriad yn gywir?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Cau",
   "bundle_modal_error.message": "Aeth rhywbeth o'i le tra'n llwytho'r elfen hon.",
@@ -115,14 +116,14 @@
   "closed_registrations_modal.description": "Ar hyn o bryd nid yw'n bosib creu cyfrif ar {domain}, ond cadwch mewn cof nad oes raid i chi gael cyfrif yn benodol ar {domain} i ddefnyddio Mastodon.",
   "closed_registrations_modal.find_another_server": "Dod o hyd i weinydd arall",
   "closed_registrations_modal.preamble": "Mae Mastodon wedi'i ddatganoli, felly does dim gwahaniaeth ble rydych chi'n creu eich cyfrif, byddwch chi'n gallu dilyn a rhyngweithio ag unrhyw un ar y gweinydd hwn. Gallwch hyd yn oed ei gynnal un eich hun!",
-  "closed_registrations_modal.title": "Ymgofrestru ar Mastodon",
+  "closed_registrations_modal.title": "Cofrestru ar Mastodon",
   "column.about": "Ynghylch",
-  "column.blocks": "Defnyddwyr a flociwyd",
+  "column.blocks": "Defnyddwyr wedi'u rhwystro",
   "column.bookmarks": "Llyfrnodau",
   "column.community": "Ffrwd lleol",
   "column.direct": "Crybwylliadau preifat",
   "column.directory": "Pori proffiliau",
-  "column.domain_blocks": "Parthau wedi'u blocio",
+  "column.domain_blocks": "Parthau wedi'u rhwystro",
   "column.favourites": "Ffefrynnau",
   "column.firehose": "Ffrydiau byw",
   "column.follow_requests": "Ceisiadau dilyn",
@@ -133,7 +134,7 @@
   "column.pins": "Postiadau wedi eu pinio",
   "column.public": "Ffrwd y ffederasiwn",
   "column_back_button.label": "Nôl",
-  "column_header.hide_settings": "Cuddio dewisiadau",
+  "column_header.hide_settings": "Cuddio'r dewisiadau",
   "column_header.moveLeft_settings": "Symud y golofn i'r chwith",
   "column_header.moveRight_settings": "Symud y golofn i'r dde",
   "column_header.pin": "Pinio",
@@ -150,7 +151,7 @@
   "compose.saved.body": "Postiad wedi'i gadw.",
   "compose_form.direct_message_warning_learn_more": "Dysgu mwy",
   "compose_form.encryption_warning": "Dyw postiadau ar Mastodon ddim wedi'u hamgryptio o ben i ben. Peidiwch â rhannu unrhyw wybodaeth sensitif dros Mastodon.",
-  "compose_form.hashtag_warning": "Ni fydd y postiad hwn wedi ei restru o dan unrhyw hashnod gan nad yw'n gyhoeddus. Dim ond postiadau cyhoeddus y mae modd eu chwilio drwy hashnod.",
+  "compose_form.hashtag_warning": "Fydd y postiad hwn ddim wedi'i restru o dan unrhyw hashnod gan nad yw'n gyhoeddus. Dim ond postiadau cyhoeddus y mae modd eu chwilio drwy hashnod.",
   "compose_form.lock_disclaimer": "Nid yw eich cyfri wedi'i {locked}. Gall unrhyw un eich dilyn i weld eich postiadau dilynwyr-yn-unig.",
   "compose_form.lock_disclaimer.lock": "wedi ei gloi",
   "compose_form.placeholder": "Beth sydd ar eich meddwl?",
@@ -161,15 +162,15 @@
   "compose_form.poll.switch_to_multiple": "Newid pleidlais i adael mwy nag un dewis",
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
   "compose_form.poll.type": "Arddull",
-  "compose_form.publish": "Postiad",
+  "compose_form.publish": "Postio",
-  "compose_form.publish_form": "Cyhoeddi",
+  "compose_form.publish_form": "Postiad newydd",
-  "compose_form.reply": "Ateb",
+  "compose_form.reply": "Ymateb",
-  "compose_form.save_changes": "Diweddariad",
+  "compose_form.save_changes": "Diweddaru",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
   "confirmation_modal.cancel": "Canslo",
-  "confirmations.block.confirm": "Blocio",
+  "confirmations.block.confirm": "Rhwystro",
   "confirmations.delete.confirm": "Dileu",
   "confirmations.delete.message": "Ydych chi'n sicr eich bod eisiau dileu y post hwn?",
   "confirmations.delete.title": "Dileu postiad?",
@@ -188,7 +189,7 @@
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'r postiad hwn a'i ailddrafftio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r post gwreiddiol yn mynd yn amddifad.",
   "confirmations.redraft.title": "Dileu & ailddraftio postiad?",
-  "confirmations.reply.confirm": "Ateb",
+  "confirmations.reply.confirm": "Ymateb",
   "confirmations.reply.message": "Bydd ateb nawr yn cymryd lle y neges yr ydych yn cyfansoddi ar hyn o bryd. Ydych chi'n siŵr eich bod am barhau?",
   "confirmations.reply.title": "Trosysgrifo'r postiad?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
+  "content_warning.show_more": "Dangos rhagor",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -209,8 +211,8 @@
   "directory.recently_active": "Ar-lein yn ddiweddar",
   "disabled_account_banner.account_settings": "Gosodiadau'r cyfrif",
   "disabled_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd.",
-  "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl sydd â chyfrifon ar {domain}.",
+  "dismissable_banner.community_timeline": "Dyma'r postiadau cyhoeddus diweddaraf gan bobl y caiff eu cyfrifon eu cynnal ar {domain}.",
-  "dismissable_banner.dismiss": "Cau",
+  "dismissable_banner.dismiss": "Diystyru",
   "dismissable_banner.explore_links": "Dyma straeon newyddion sy’n cael eu rhannu fwyaf ar y we gymdeithasol heddiw. Mae'r straeon newyddion diweddaraf sy'n cael eu postio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
   "dismissable_banner.explore_statuses": "Dyma postiadau o bob gwr o'r we gymdeithasol sy'n derbyn sylw heddiw. Mae postiadau mwy diweddar sydd â mwy o hybiau a ffefrynnau'n cael eu graddio'n uwch.",
   "dismissable_banner.explore_tags": "Mae'r rhain yn hashnodau sydd ar gynnydd ar y we gymdeithasol heddiw. Mae hashnodau sy'n cael eu defnyddio gan fwy o unigolion gwahanol yn cael eu graddio'n uwch.",
@@ -218,9 +220,11 @@
   "domain_block_modal.block": "Blocio gweinydd",
   "domain_block_modal.block_account_instead": "Blocio @{name} yn ei le",
   "domain_block_modal.they_can_interact_with_old_posts": "Gall pobl o'r gweinydd hwn ryngweithio â'ch hen bostiadau.",
-  "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
+  "domain_block_modal.they_cant_follow": "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.",
@@ -256,10 +260,10 @@
   "empty_column.account_suspended": "Cyfrif wedi'i atal",
   "empty_column.account_timeline": "Dim postiadau yma!",
   "empty_column.account_unavailable": "Nid yw'r proffil ar gael",
-  "empty_column.blocks": "Nid ydych wedi blocio unrhyw ddefnyddwyr eto.",
+  "empty_column.blocks": "Dydych chi heb rwystro unrhyw ddefnyddwyr eto.",
-  "empty_column.bookmarked_statuses": "Nid oes gennych unrhyw bostiad wedi'u cadw fel nod tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
+  "empty_column.bookmarked_statuses": "Does gennych chi ddim unrhyw bostiad wedi'u cadw fel nod tudalen eto. Pan fyddwch yn gosod nod tudalen i un, mi fydd yn ymddangos yma.",
   "empty_column.community": "Mae'r ffrwd lleol yn wag. Beth am ysgrifennu rhywbeth cyhoeddus!",
-  "empty_column.direct": "Nid oes gennych unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
+  "empty_column.direct": "Does gennych chi unrhyw grybwylliadau preifat eto. Pan fyddwch chi'n anfon neu'n derbyn un, bydd yn ymddangos yma.",
   "empty_column.domain_blocks": "Nid oes unrhyw barthau wedi'u blocio eto.",
   "empty_column.explore_statuses": "Does dim pynciau llosg ar hyn o bryd. Dewch nôl nes ymlaen!",
   "empty_column.favourited_statuses": "Rydych chi heb ffafrio unrhyw bostiadau eto. Pan byddwch chi'n ffafrio un, bydd yn ymddangos yma.",
@@ -302,8 +306,8 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
-  "filter_warning.matches_filter": "Yn cydweddu'r hidlydd “{title}”",
+  "filter_warning.matches_filter": "Yn cyd-fynd â'r hidlydd “ <span>{title}</span> ”",
-  "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
+  "filtered_notifications_banner.pending_requests": "Oddi wrth {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
@@ -346,22 +350,22 @@
   "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
   "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{cyfrif, lluosog, un {{counter} cyfranogwr} arall {{counter} cyfranogwr}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} cyfranogwr} other {{counter} cyfranogwr}}",
   "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
-  "hashtag.counter_by_uses_today": "{cyfrif, lluosog, un {{counter} postiad} arall {{counter} postiad}} heddiw",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
-  "hashtags.and_other": "…a {count, plural, other {# more}}",
+  "hashtags.and_other": "…a {count, plural, other {# arall}}",
   "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.follows_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.posts_may_be_missing": "Mae'n bosibl bod rhai postiadau y proffil hwn ar goll.",
   "hints.profiles.see_more_followers": "Gweld mwy o ddilynwyr ar {domain}",
   "hints.profiles.see_more_follows": "Gweld mwy o 'yn dilyn' ar {domain}",
   "hints.profiles.see_more_posts": "Gweld mwy o bostiadau ar {domain}",
-  "hints.threads.replies_may_be_missing": "Mae'n bosibl y bydd atebion gan weinyddion eraill ar goll.",
+  "hints.threads.replies_may_be_missing": "Mae'n bosibl y bydd ymatebion gan weinyddion eraill ar goll.",
-  "hints.threads.see_more": "Gweld mwy o atebion ar {domain}",
+  "hints.threads.see_more": "Gweld mwy o ymatebion ar {domain}",
   "home.column_settings.show_reblogs": "Dangos hybiau",
-  "home.column_settings.show_replies": "Dangos atebion",
+  "home.column_settings.show_replies": "Dangos ymatebion",
   "home.hide_announcements": "Cuddio cyhoeddiadau",
   "home.pending_critical_update.body": "Diweddarwch eich gweinydd Mastodon cyn gynted â phosibl!",
   "home.pending_critical_update.link": "Gweld diweddariadau",
@@ -420,7 +424,7 @@
   "keyboard_shortcuts.open_media": "Agor cyfryngau",
   "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
   "keyboard_shortcuts.profile": "Agor proffil yr awdur",
-  "keyboard_shortcuts.reply": "Ateb i bostiad",
+  "keyboard_shortcuts.reply": "Ymateb i bostiad",
   "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
   "keyboard_shortcuts.search": "Ffocysu ar y bar chwilio",
   "keyboard_shortcuts.spoilers": "Dangos/cuddio'r maes CW",
@@ -439,11 +443,11 @@
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
   "link_preview.more_from_author": "Mwy gan {name}",
-  "link_preview.shares": "{count, plural, one {{counter} ostiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
+  "link_preview.shares": "{count, plural, one {{counter} postiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
-  "lists.delete": "Dileu rhestr",
+  "lists.delete": "Dileu'r rhestr",
-  "lists.edit": "Golygu rhestr",
+  "lists.edit": "Golygu'r rhestr",
   "lists.edit.submit": "Newid teitl",
   "lists.exclusive": "Cuddio'r postiadau hyn o'r ffrwd gartref",
   "lists.new.create": "Ychwanegu rhestr",
@@ -457,7 +461,7 @@
   "load_pending": "{count, plural, one {# eitem newydd} other {# eitem newydd}}",
   "loading_indicator.label": "Yn llwytho…",
   "media_gallery.hide": "Cuddio",
-  "moved_to_account_banner.text": "Ar hyn y bryd, mae eich cyfrif {disabledAccount} wedi ei analluogi am i chi symud i {movedToAccount}.",
+  "moved_to_account_banner.text": "Mae eich cyfrif {disabledAccount} wedi ei analluogi ar hyn o bryd am i chi symud i {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Cuddio rhag hysbysiadau",
   "mute_modal.hide_options": "Cuddio'r dewis",
   "mute_modal.indefinite": "Nes i mi eu dad-dewi",
@@ -495,24 +499,25 @@
   "navigation_bar.search": "Chwilio",
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
-  "notification.admin.report": "Adroddwyd ar {name} {target}",
+  "notification.admin.report": "Adroddodd {name} {target}",
-  "notification.admin.report_account": "{name} reported {count, plural, one {un postiad} other {# postiad}} from {target} for {category}",
+  "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}",
-  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# phost} other {# postiad}} gan {target}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}",
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # eraill}}",
+  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}",
   "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.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# arall}}</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 {# arall} two {# arall} few {# arall} many {# others} other {# arall}}</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.follow_request.name_and_others": "Mae {name} a{count, plural, one {# arall} other {# arall}} wedi gofyn i'ch dilyn chi",
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
-  "notification.label.private_reply": "Ateb preifat",
+  "notification.label.private_reply": "Ymateb preifat",
-  "notification.label.reply": "Ateb",
+  "notification.label.reply": "Ymateb",
   "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.",
@@ -525,7 +530,7 @@
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
-  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# other} other {# others}}</a> wedi hybu eich postiad",
+  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
   "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
@@ -534,9 +539,9 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
-  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais…} other {Derbyn # cais…}}",
-  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Derbyn cais} other {Derbyn cais}}",
-  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {one notification request} other {# notification requests}}. Ydych chi'n siŵr eich bod am barhau?",
+  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysiad} other {# cais hysbysiad}}. Ydych chi'n siŵr eich bod am barhau?",
   "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
   "notification_requests.confirm_dismiss_multiple.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Fyddwch chi ddim yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. Ydych chi'n yn siŵr eich bod am fwrw ymlaen?",
@@ -563,6 +568,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",
@@ -684,7 +690,7 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
-  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
+  "reply_indicator.attachments": "{count, plural, one {# atodiad} other {# atodiad}}",
   "reply_indicator.cancel": "Canslo",
   "reply_indicator.poll": "Arolwg",
   "report.block": "Blocio",
@@ -693,7 +699,7 @@
   "report.categories.other": "Arall",
   "report.categories.spam": "Sbam",
   "report.categories.violation": "Mae cynnwys yn torri un neu fwy o reolau'r gweinydd",
-  "report.category.subtitle": "Dewiswch y gyfatebiaeth gorau",
+  "report.category.subtitle": "Dewiswch yr ateb gorau",
   "report.category.title": "Beth sy'n digwydd gyda'r {type} yma?",
   "report.category.title_account": "proffil",
   "report.category.title_status": "post",
@@ -727,7 +733,7 @@
   "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
   "report.unfollow": "Dad-ddilyn @{name}",
   "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich ffrwd gartref mwyach, dad-ddilynwch nhw.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} other {{count} postiad}} wedi'i atodi",
   "report_notification.categories.legal": "Cyfreithiol",
   "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
   "report_notification.categories.other": "Arall",
@@ -807,13 +813,13 @@
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
-  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
+  "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",
   "status.replied_in_thread": "Atebodd mewn edefyn",
   "status.replied_to": "Wedi ateb {name}",
-  "status.reply": "Ateb",
+  "status.reply": "Ymateb",
   "status.replyAll": "Ateb i edefyn",
   "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
@@ -849,6 +855,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

@@ -29,7 +29,7 @@
   "account.endorse": "Fremhæv på profil",
   "account.featured_tags.last_status_at": "Seneste indlæg {date}",
   "account.featured_tags.last_status_never": "Ingen indlæg",
-  "account.featured_tags.title": "{name}s fremhævede hashtags",
+  "account.featured_tags.title": "{name}s fremhævede etiketter",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbage",
   "account.followers": "Følgere",
@@ -39,7 +39,7 @@
   "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.go_to_profile": "Gå til profil",
-  "account.hide_reblogs": "Skjul boosts fra @{name}",
+  "account.hide_reblogs": "Skjul fremhævelser fra @{name}",
   "account.in_memoriam": "Til minde om.",
   "account.joined_short": "Oprettet",
   "account.languages": "Skift abonnementssprog",
@@ -49,9 +49,9 @@
   "account.mention": "Nævn @{name}",
   "account.moved_to": "{name} har angivet, at vedkommendes nye konto nu er:",
   "account.mute": "Skjul @{name}",
-  "account.mute_notifications_short": "Slå lyden fra for notifikationer",
+  "account.mute_notifications_short": "Sluk for notifikationer",
-  "account.mute_short": "Skjul (mute)",
+  "account.mute_short": "Skjul",
-  "account.muted": "Skjult (muted)",
+  "account.muted": "Skjult",
   "account.mutual": "Fælles",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.open_original_page": "Åbn oprindelig side",
@@ -63,14 +63,14 @@
   "account.share": "Del @{name}s profil",
   "account.show_reblogs": "Vis fremhævelser fra @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
-  "account.unblock": "Afblokér @{name}",
+  "account.unblock": "Fjern blokering af @{name}",
-  "account.unblock_domain": "Afblokér domænet {domain}",
+  "account.unblock_domain": "Fjern blokering af domænet {domain}",
-  "account.unblock_short": "Afblokér",
+  "account.unblock_short": "Fjern blokering",
   "account.unendorse": "Fjern visning på din profil",
   "account.unfollow": "Følg ikke længere",
-  "account.unmute": "Vis @{name} igen (unmute)",
+  "account.unmute": "Vis @{name} igen",
-  "account.unmute_notifications_short": "Slå lyden fra for notifikationer",
+  "account.unmute_notifications_short": "Tænd for notifikationer",
-  "account.unmute_short": "Vis igen (unmute)",
+  "account.unmute_short": "Vis igen",
   "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate per dag efter tilmelding",
   "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate per måned efter tilmelding",
@@ -90,16 +90,16 @@
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
   "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
-  "block_modal.show_less": "Vis mindre",
+  "block_modal.show_less": "Vis færre",
   "block_modal.show_more": "Vis flere",
-  "block_modal.they_cant_mention": "Vedkommende kan ikke nævne eller følge dig.",
+  "block_modal.they_cant_mention": "Vedkommende kan ikke omtale eller følge dig.",
   "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
   "block_modal.they_will_know": "Vedkommende kan se den aktive blokering.",
   "block_modal.title": "Blokér bruger?",
-  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som nævner vedkommende.",
+  "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som omtaler vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
-  "boost_modal.reblog": "Boost indlæg?",
+  "boost_modal.reblog": "Fremhæv indlæg?",
-  "boost_modal.undo_reblog": "Fjern boost af indlæg?",
+  "boost_modal.undo_reblog": "Fjern fremhævning af indlæg?",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
   "bundle_column_error.error.title": "Åh nej!",
@@ -125,11 +125,11 @@
   "column.directory": "Tjek profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.favourites": "Favoritter",
-  "column.firehose": "Live feeds",
+  "column.firehose": "Aktuelt",
   "column.follow_requests": "Følgeanmodninger",
   "column.home": "Hjem",
   "column.lists": "Lister",
-  "column.mutes": "Skjulte brugere (mutede)",
+  "column.mutes": "Skjulte brugere",
   "column.notifications": "Notifikationer",
   "column.pins": "Fastgjorte indlæg",
   "column.public": "Fælles tidslinje",
@@ -139,7 +139,7 @@
   "column_header.moveRight_settings": "Flyt kolonne til højre",
   "column_header.pin": "Fastgør",
   "column_header.show_settings": "Vis indstillinger",
-  "column_header.unpin": "Løsgør",
+  "column_header.unpin": "Frigør",
   "column_subheading.settings": "Indstillinger",
   "community.column_settings.local_only": "Kun lokalt",
   "community.column_settings.media_only": "Kun medier",
@@ -151,7 +151,7 @@
   "compose.saved.body": "Indlæg gemt.",
   "compose_form.direct_message_warning_learn_more": "Få mere at vide",
   "compose_form.encryption_warning": "Indlæg på Mastodon er ikke ende-til-ende-krypteret. Del derfor ikke sensitiv information via Mastodon.",
-  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under noget hashtag, da kun offentlige indlæg er søgbare via hashtags.",
+  "compose_form.hashtag_warning": "Da indlægget ikke er offentligt, vises det ikke under nogen etiket, da kun offentlige indlæg er søgbare via etiketter.",
   "compose_form.lock_disclaimer": "Din konto er ikke {locked}. Enhver kan følge dig og se indlæg kun beregnet for følgere.",
   "compose_form.lock_disclaimer.lock": "låst",
   "compose_form.placeholder": "Hvad tænker du på?",
@@ -166,9 +166,9 @@
   "compose_form.publish_form": "Publicér",
   "compose_form.reply": "Svar",
   "compose_form.save_changes": "Opdatér",
-  "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
+  "compose_form.spoiler.marked": "Fjern emnefelt",
-  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
+  "compose_form.spoiler.unmarked": "Tilføj emnefelt",
-  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
+  "compose_form.spoiler_placeholder": "Emnefelt (valgfrit)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.confirm": "Blokér",
   "confirmations.delete.confirm": "Slet",
@@ -185,9 +185,9 @@
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.logout.title": "Log ud?",
-  "confirmations.mute.confirm": "Skjul (mute)",
+  "confirmations.mute.confirm": "Skjul",
   "confirmations.redraft.confirm": "Slet og omformulér",
-  "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og boosts går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
+  "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og fremhævelser går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
   "confirmations.redraft.title": "Slet og omformulér indlæg?",
   "confirmations.reply.confirm": "Svar",
   "confirmations.reply.message": "Hvis du svarer nu, vil det overskrive den besked, du er ved at skrive. Fortsæt alligevel?",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
+  "content_warning.show_more": "Vis flere",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -204,7 +205,7 @@
   "copy_icon_button.copied": "Kopieret til udklipsholderen",
   "copypaste.copied": "Kopieret",
   "copypaste.copy_to_clipboard": "Kopiér til udklipsholder",
-  "directory.federated": "Fra kendt fedivers",
+  "directory.federated": "Fra kendt fødivers",
   "directory.local": "Kun fra {domain}",
   "directory.new_arrivals": "Nye ankomster",
   "directory.recently_active": "Aktive for nyligt",
@@ -213,32 +214,32 @@
   "dismissable_banner.community_timeline": "Disse er de seneste offentlige indlæg fra personer med konti hostet af {domain}.",
   "dismissable_banner.dismiss": "Afvis",
   "dismissable_banner.explore_links": "Der tales lige nu om disse nyhedshistorier af folk på denne og andre servere i det decentraliserede netværk.",
-  "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere boosts og favoritter rangeres højere.",
+  "dismissable_banner.explore_statuses": "Disse indlæg fra diverse sociale netværk vinder fodfæste i dag. Nyere indlæg med flere fremhævelser og favoritter rangeres højere.",
-  "dismissable_banner.explore_tags": "Disse hashtages vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
+  "dismissable_banner.explore_tags": "Disse etiketter vinder lige nu fodfæste blandt folk på denne og andre servere i det decentraliserede netværk.",
   "dismissable_banner.public_timeline": "Dette er de seneste offentlige indlæg fra folk på det sociale netværk, som folk på {domain} følger.",
   "domain_block_modal.block": "Blokér server",
   "domain_block_modal.block_account_instead": "Blokér i stedet @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "Folk fra denne server kan interagere med de gamle indlæg.",
   "domain_block_modal.they_cant_follow": "Ingen fra denne server kan følge dig.",
-  "domain_block_modal.they_wont_know": "Vedkommende ser ikke den aktive blokering.",
+  "domain_block_modal.they_wont_know": "De ser ikke den aktive blokering.",
   "domain_block_modal.title": "Blokér domæne?",
   "domain_block_modal.you_will_lose_num_followers": "Man vil miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} person, man følger} other {{followingCountDisplay} personer, man følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Alle følgere og personer som følges på denne server mistes.",
   "domain_block_modal.you_wont_see_posts": "Indlæg eller notifikationer fra brugere på denne server vises ikke.",
-  "domain_pill.activitypub_lets_connect": "Det muliggør at komme i forbindelse og interagere med folk ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
+  "domain_pill.activitypub_lets_connect": "Det muliggører at forbinde og interagere med folk, ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
-  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", Mastodon taler med andre sociale netværk.",
+  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", som Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Vedkommendes handle:",
+  "domain_pill.their_handle": "Deres greb:",
   "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
   "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "domain_pill.username": "Brugernavn",
-  "domain_pill.whats_in_a_handle": "Hvad er der i et handle (@brugernavn)?",
+  "domain_pill.whats_in_a_handle": "Hvad er der i et greb?",
-  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_they_are": "Da et greb fortæller, hvem nogen er, og hvor de er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
-  "domain_pill.who_you_are": "Da et handle fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
+  "domain_pill.who_you_are": "Da et greb fortæller, hvem man er, og hvor man er, kan man interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
-  "domain_pill.your_handle": "Dit handle:",
+  "domain_pill.your_handle": "Dit greb:",
-  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om denne? Overfør til enhver tid servere samt tilhængere også.",
+  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.",
   "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
-  "embed.instructions": "Indlejr dette indlæg på dit websted ved at kopiere nedenstående kode.",
+  "embed.instructions": "Indlejr dette indlæg på din hjemmeside ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
   "emoji_button.clear": "Ryd",
@@ -257,30 +258,30 @@
   "emoji_button.travel": "Rejser og steder",
   "empty_column.account_hides_collections": "Brugeren har valgt ikke at gøre denne information tilgængelig",
   "empty_column.account_suspended": "Konto suspenderet",
-  "empty_column.account_timeline": "Ingen indlæg hér!",
+  "empty_column.account_timeline": "Ingen indlæg her!",
   "empty_column.account_unavailable": "Profil utilgængelig",
   "empty_column.blocks": "Ingen brugere blokeret endnu.",
   "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
-  "empty_column.direct": "Der er endnu ingen private omtaler. Når en sendes eller modtages, dukker den op hér.",
+  "empty_column.direct": "Der er endnu ingen private omtaler. Når en sendes eller modtages, dukker den op her.",
   "empty_column.domain_blocks": "Ingen blokerede domæner endnu.",
   "empty_column.explore_statuses": "Ingen nye tendenser lige nu. Tjek igen senere!",
-  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du favoritmarkerer ét, vil det dukke op hér.",
+  "empty_column.favourited_statuses": "Du har endnu ingen favoritindlæg. Når du føjer et opslag til favoritter, vil det dukke op her.",
-  "empty_column.favourites": "Ingen har endnu gjort dette indlæg til favorit. Når nogen gør dét, vil det dukke op hér.",
+  "empty_column.favourites": "Ingen har endnu føjet dette indlæg til favoritter. Når nogen gør det, vil det dukke op her.",
-  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op hér.",
+  "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op her.",
-  "empty_column.followed_tags": "Ingen hashtags følges endnu. Når det sker, vil de fremgå hér.",
+  "empty_column.followed_tags": "Ingen etiketter følges endnu. Når det sker, vil de fremgå her.",
-  "empty_column.hashtag": "Der er intet med dette hashtag endnu.",
+  "empty_column.hashtag": "Der er intet med denne etiket endnu.",
-  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at udfylde den. {suggestions}",
+  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at fylde den op.",
-  "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå hér.",
+  "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af listen udgiver nye indlæg vil de fremgå her.",
   "empty_column.lists": "Du har endnu ingen lister. Når du opretter én, vil den fremgå hér.",
-  "empty_column.mutes": "Du har endnu ikke skjult (muted) nogle brugere.",
+  "empty_column.mutes": "Du har endnu ikke skjult nogle brugere.",
-  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jf. dine indstillinger.",
+  "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jævnfør dine indstillinger.",
-  "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå hér.",
+  "empty_column.notifications": "Du har endnu ingen notifikationer. Når andre interagerer med dig, vil det fremgå her.",
-  "empty_column.public": "Der er intet hér! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
+  "empty_column.public": "Der er intet her! Skriv noget offentligt eller følg manuelt brugere fra andre servere for at se indhold",
-  "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en browser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
+  "error.unexpected_crash.explanation": "Grundet en fejl i vores kode, eller en netlæser-kompatibilitetsfejl, kunne siden ikke vises korrekt.",
   "error.unexpected_crash.explanation_addons": "Denne side kunne ikke vises korrekt. Fejlen skyldes sandsynligvis en browsertilføjelse eller automatiske oversættelsesværktøjer.",
-  "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
+  "error.unexpected_crash.next_steps": "Prøv at opfriske siden. Hjælper dette ikke, kan Mastodon muligvis stadig bruges via en anden netlæser eller app.",
-  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden browser eller app.",
+  "error.unexpected_crash.next_steps_addons": "Prøv at deaktivere dem og genindlæse siden. Hvis det ikke hjælper, kan Mastodon muligvis stadig bruges via en anden netlæser eller app.",
   "errors.unexpected_crash.copy_stacktrace": "Kopiér stacktrace til udklipsholderen",
   "errors.unexpected_crash.report_issue": "Anmeld problem",
   "explore.search_results": "Søgeresultater",
@@ -288,7 +289,7 @@
   "explore.title": "Udforsk",
   "explore.trending_links": "Nyheder",
   "explore.trending_statuses": "Indlæg",
-  "explore.trending_tags": "Hashtags",
+  "explore.trending_tags": "Etiketter",
   "filter_modal.added.context_mismatch_explanation": "Denne filterkategori omfatter ikke konteksten, hvorunder dette indlæg er tilgået. Redigér filteret, hvis indlægget også ønskes filtreret i denne kontekst.",
   "filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
   "filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",
@@ -296,7 +297,7 @@
   "filter_modal.added.review_and_configure": "Gå til {settings_link} for at gennemse og yderligere opsætte denne filterkategori.",
   "filter_modal.added.review_and_configure_title": "Filterindstillinger",
   "filter_modal.added.settings_link": "indstillingsside",
-  "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til flg. filterkategori: {title}.",
+  "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til følgende filterkategori: {title}.",
   "filter_modal.added.title": "Filter tilføjet!",
   "filter_modal.select_filter.context_mismatch": "gælder ikke for denne kontekst",
   "filter_modal.select_filter.expired": "udløbet",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
-  "filter_warning.matches_filter": "Matcher filteret “{title}”",
+  "filter_warning.matches_filter": "Matcher filteret “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",
@@ -329,7 +330,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Svarende til profiler, som for nylig er fulgt",
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Hvem, som skal følges",
-  "followed_tags": "Hashtag, som følges",
+  "followed_tags": "Etiketter, som følges",
   "footer.about": "Om",
   "footer.directory": "Profiloversigt",
   "footer.get_app": "Hent appen",
@@ -344,7 +345,7 @@
   "hashtag.column_header.tag_mode.any": "eller {additional}",
   "hashtag.column_header.tag_mode.none": "uden {additional}",
   "hashtag.column_settings.select.no_options_message": "Ingen forslag fundet",
-  "hashtag.column_settings.select.placeholder": "Angiv hashtags…",
+  "hashtag.column_settings.select.placeholder": "Angiv etiketter…",
   "hashtag.column_settings.tag_mode.all": "Alle disse",
   "hashtag.column_settings.tag_mode.any": "Nogle af disse",
   "hashtag.column_settings.tag_mode.none": "Ingen af disse",
@@ -352,8 +353,8 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} deltager} other {{counter} deltagere}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
-  "hashtag.follow": "Følg hashtag",
+  "hashtag.follow": "Følg etiket",
-  "hashtag.unfollow": "Stop med at følge hashtag",
+  "hashtag.unfollow": "Stop med at følge etiket",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
   "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",
   "hints.profiles.follows_may_be_missing": "Fulgte kan mangle for denne profil.",
@@ -363,15 +364,15 @@
   "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
   "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
   "hints.threads.see_more": "Se flere svar på {domain}",
-  "home.column_settings.show_reblogs": "Vis boosts",
+  "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
-  "home.pending_critical_update.body": "Opdater din Mastodon-server snarest muligt!",
+  "home.pending_critical_update.body": "Opdatér venligst din Mastodon-server snarest muligt!",
   "home.pending_critical_update.link": "Se opdateringer",
   "home.pending_critical_update.title": "Kritisk sikkerhedsopdatering tilgængelig!",
   "home.show_announcements": "Vis bekendtgørelser",
   "ignore_notifications_modal.disclaimer": "Mastodon kan ikke informere brugere om, at man har ignoreret deres notifikationer. Ignorerer man notifikationer, forhindrer det ikke selve beskedafsendelsen.",
-  "ignore_notifications_modal.filter_instead": "Filtrer i stedet",
+  "ignore_notifications_modal.filter_instead": "Filtrér i stedet",
   "ignore_notifications_modal.filter_to_act_users": "Man vil stadig kunne acceptere, afvise eller anmelde brugere",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering medvirker til at undgå potentiel forvirring",
   "ignore_notifications_modal.filter_to_review_separately": "Man kan gennemgå filtrerede notifikationer separat",
@@ -392,32 +393,32 @@
   "interaction_modal.on_this_server": "På denne server",
   "interaction_modal.sign_in": "Du er ikke logget ind på denne server. Hvor hostes din konto?",
   "interaction_modal.sign_in_hint": "Tip: Det er webstedet, hvor du tilmeldte dig. Har du glemt det, så kig efter velkomstmailen i indbakken. Du kan også angive dit fulde brugernavn! (f.eks. @Mastodon@mastodon.social)",
-  "interaction_modal.title.favourite": "Gør {name}s indlæg til favorit",
+  "interaction_modal.title.favourite": "Føj {name}s indlæg til favoritter",
   "interaction_modal.title.follow": "Følg {name}",
-  "interaction_modal.title.reblog": "Boost {name}s indlæg",
+  "interaction_modal.title.reblog": "Fremhæv {name}s indlæg",
   "interaction_modal.title.reply": "Besvar {name}s indlæg",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutter}}",
   "keyboard_shortcuts.back": "Gå tilbage",
   "keyboard_shortcuts.blocked": "Åbn listen over blokerede brugere",
-  "keyboard_shortcuts.boost": "Boost indlæg",
+  "keyboard_shortcuts.boost": "Fremhæv indlæg",
   "keyboard_shortcuts.column": "Fokusér kolonne",
   "keyboard_shortcuts.compose": "Fokusér skriveområdet",
   "keyboard_shortcuts.description": "Beskrivelse",
   "keyboard_shortcuts.direct": "for at åbne kolonnen private omtaler",
   "keyboard_shortcuts.down": "Flyt nedad på listen",
   "keyboard_shortcuts.enter": "Åbn indlæg",
-  "keyboard_shortcuts.favourite": "Favoritmarkér indlæg",
+  "keyboard_shortcuts.favourite": "Føj indlæg til favoritter",
   "keyboard_shortcuts.favourites": "Åbn favoritlisten",
-  "keyboard_shortcuts.federated": "Åbn fælles tidslinje",
+  "keyboard_shortcuts.federated": "Åbn fødereret tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
   "keyboard_shortcuts.home": "Åbn hjemmetidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
   "keyboard_shortcuts.legend": "Vis dette symbol",
   "keyboard_shortcuts.local": "Åbn lokal tidslinje",
   "keyboard_shortcuts.mention": "Omtal forfatter",
-  "keyboard_shortcuts.muted": "Åbn listen over skjulte (mutede) brugere",
+  "keyboard_shortcuts.muted": "Åbn listen over skjulte brugere",
   "keyboard_shortcuts.my_profile": "Åbn din profil",
   "keyboard_shortcuts.notifications": "for at åbne notifikationskolonnen",
   "keyboard_shortcuts.open_media": "Åbn medier",
@@ -426,9 +427,9 @@
   "keyboard_shortcuts.reply": "Besvar indlægget",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
   "keyboard_shortcuts.search": "Fokusér søgebjælke",
-  "keyboard_shortcuts.spoilers": "Vis/skjul CW-felt",
+  "keyboard_shortcuts.spoilers": "Vis/skjul emnefelt",
   "keyboard_shortcuts.start": "Åbn \"komme i gang\"-kolonne",
-  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag CW",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag emnefelt",
   "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul medier",
   "keyboard_shortcuts.toot": "Påbegynd nyt indlæg",
   "keyboard_shortcuts.unfocus": "Fjern fokus fra tekstskrivningsområde/søgning",
@@ -463,16 +464,16 @@
   "moved_to_account_banner.text": "Din konto {disabledAccount} er pt. deaktiveret, da du flyttede til {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skjul fra notifikationer",
   "mute_modal.hide_options": "Skjul valgmuligheder",
-  "mute_modal.indefinite": "Indtil jeg fjerner tavsgørelsen",
+  "mute_modal.indefinite": "Indtil jeg vælger at se dem igen",
   "mute_modal.show_options": "Vis valgmuligheder",
-  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
+  "mute_modal.they_can_mention_and_follow": "De kan omtale og følge dig, men du vil ikke se dem.",
-  "mute_modal.they_wont_know": "Vedkommende ser ikke den aktive tavsgørelse.",
+  "mute_modal.they_wont_know": "De vil ikke vide, at de er blevet skjult.",
-  "mute_modal.title": "Tavsgør bruger?",
+  "mute_modal.title": "Skjul bruger?",
-  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
+  "mute_modal.you_wont_see_mentions": "Du vil ikke se indlæg som omtaler dem.",
-  "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
+  "mute_modal.you_wont_see_posts": "De kan stadig se dine indlæg, men du vil ikke se deres.",
   "navigation_bar.about": "Om",
-  "navigation_bar.administration": "Håndtering",
+  "navigation_bar.administration": "Administration",
-  "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
+  "navigation_bar.advanced_interface": "Åbn i avanceret netgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
   "navigation_bar.community_timeline": "Lokal tidslinje",
@@ -482,14 +483,14 @@
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.explore": "Udforsk",
   "navigation_bar.favourites": "Favoritter",
-  "navigation_bar.filters": "Skjulte ord (mutede)",
+  "navigation_bar.filters": "Skjulte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
-  "navigation_bar.followed_tags": "Hashtag, som følges",
+  "navigation_bar.followed_tags": "Etiketter, som følges",
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.lists": "Lister",
   "navigation_bar.logout": "Log af",
   "navigation_bar.moderation": "Moderering",
-  "navigation_bar.mutes": "Skjulte brugere (mutede)",
+  "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.personal": "Personlig",
   "navigation_bar.pins": "Fastgjorte indlæg",
@@ -505,44 +506,45 @@
   "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
   "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} tilmeldte sig",
-  "notification.favourite": "{name} favoritmarkerede dit indlæg",
+  "notification.favourite": "{name} føjede dit indlæg til favoritter",
-  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> gjorde dit indlæg til favorit",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> føjede dit indlæg til favoritter",
   "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",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
-  "notification.label.reply": "Besvar",
+  "notification.label.reply": "Svar",
   "notification.mention": "Omtale",
+  "notification.mentioned_you": "{name} omtalte dig",
   "notification.moderation-warning.learn_more": "Læs mere",
-  "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
+  "notification.moderation_warning": "Du har fået en moderationsadvarsel",
   "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
   "notification.moderation_warning.action_disable": "Din konto er blevet deaktiveret.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som sensitive.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Nogle af dine indlæg er blevet markeret som følsomme.",
-  "notification.moderation_warning.action_none": "Din konto er tildelt en moderationsadvarsel.",
+  "notification.moderation_warning.action_none": "Din konto har fået en moderationsadvarsel.",
-  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som sensitive.",
+  "notification.moderation_warning.action_sensitive": "Dine indlæg markeres fra nu af som følsomme.",
   "notification.moderation_warning.action_silence": "Din konto er blevet begrænset.",
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
-  "notification.reblog": "{name} boostede dit indlæg",
+  "notification.reblog": "{name} fremhævede dit indlæg",
-  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> boostede dit indlæg",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> fremhævede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
-  "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
+  "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, så du kan ikke længere få opdateringer fra eller interagere med dem.",
-  "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
+  "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} følgere og {followingCount, plural, one {# konto, der} other {# konti, som}} som du følger.",
   "notification.relationships_severance_event.learn_more": "Læs mere",
-  "notification.relationships_severance_event.user_domain_block": "{target} er blevet blokeret, og {followersCount} tilhængere samt {followingCount, plural, one {# konto, der} other {# konti, som}} følges, er hermed fjernet.",
+  "notification.relationships_severance_event.user_domain_block": "Du har blokeret {target}. {followersCount} af dine følgere samt {followingCount, plural, one {# konto, der} other {# konti, som}} du følger, er hermed fjernet.",
-  "notification.status": "{name} har netop postet",
+  "notification.status": "{name} har netop slået noget op",
   "notification.update": "{name} redigerede et indlæg",
   "notification_requests.accept": "Acceptér",
   "notification_requests.accept_multiple": "{count, plural, one {Acceptér # anmodning…} other {Acceptér # anmodninger…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptér anmodning} other {Acceptér anmodninger}}",
-  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive accepteret. Fortsæt, sikker?",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive accepteret. Er du sikker på, at du vil fortsætte?",
   "notification_requests.confirm_accept_multiple.title": "Acceptér notifikationsanmodninger?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Afvis anmodning} other {Afvis anmodninger}}",
-  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive afvist, hvorfor man ikke nemt vil kunne tilgå {count, plural, one {den} other {dem}} igen. Fortsæt, sikker?",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {En notifikationsanmodning} other {# notifikationsanmodninger}} er ved at blive afvist, hvorfor man ikke nemt vil kunne tilgå {count, plural, one {den} other {dem}} igen. Er du sikker på, at du vil fortsætte?",
   "notification_requests.confirm_dismiss_multiple.title": "Afvis notifikationsanmodninger?",
   "notification_requests.dismiss": "Afvis",
   "notification_requests.dismiss_multiple": "{count, plural, one {Afvis # anmodning…} other {Afvis # anmodninger…}}",
@@ -558,7 +560,7 @@
   "notifications.clear": "Ryd notifikationer",
   "notifications.clear_confirmation": "Er du sikker på, at du vil rydde alle dine notifikationer permanent?",
   "notifications.clear_title": "Ryd notifikationer?",
-  "notifications.column_settings.admin.report": "Nye anmeldelser:",
+  "notifications.column_settings.admin.report": "Nye rapporteringer:",
   "notifications.column_settings.admin.sign_up": "Nye tilmeldinger:",
   "notifications.column_settings.alert": "Computernotifikationer",
   "notifications.column_settings.favourite": "Favoritter:",
@@ -566,10 +568,11 @@
   "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",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.reblog": "Fremhævelser:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
   "notifications.column_settings.status": "Nye indlæg:",
@@ -577,7 +580,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Fremhæv ulæste notifikationer",
   "notifications.column_settings.update": "Redigeringer:",
   "notifications.filter.all": "Alle",
-  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.boosts": "Fremhævelser",
   "notifications.filter.favourites": "Favoritter",
   "notifications.filter.follows": "Følger",
   "notifications.filter.mentions": "Omtaler",
@@ -586,8 +589,8 @@
   "notifications.grant_permission": "Tildel tilladelse.",
   "notifications.group": "{count} notifikationer",
   "notifications.mark_as_read": "Markér alle notifikationer som læst",
-  "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist browsertilladelsesanmodning",
+  "notifications.permission_denied": "Computernotifikationer er utilgængelige grundet tidligere afvist netlæser-tilladelsesanmodning",
-  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da browsertilladelse tidligere blev nægtet",
+  "notifications.permission_denied_alert": "Computernotifikationer kan ikke aktiveres, da netlæser-tilladelse tidligere blev nægtet",
   "notifications.permission_required": "Computernotifikationer er utilgængelige, da den krævede tilladelse ikke er tildelt.",
   "notifications.policy.accept": "Acceptér",
   "notifications.policy.accept_hint": "Vis notifikationer",
@@ -619,15 +622,15 @@
   "onboarding.follows.title": "Populært på Mastodon",
   "onboarding.profile.discoverable": "Gør min profil synlig",
   "onboarding.profile.discoverable_hint": "Når man vælger at være synlig på Mastodon, kan ens indlæg fremgå i søgeresultater og tendenser, og profilen kan blive foreslået til andre med tilsvarende interesse.",
-  "onboarding.profile.display_name": "Visningsnavn",
+  "onboarding.profile.display_name": "Vist navn",
-  "onboarding.profile.display_name_hint": "Fulde navn eller dit sjove navn…",
+  "onboarding.profile.display_name_hint": "Dit fulde navn eller dit sjove navn…",
   "onboarding.profile.lead": "Dette kan altid færdiggøres senere i indstillingerne, hvor endnu flere tilpasningsmuligheder forefindes.",
   "onboarding.profile.note": "Bio",
-  "onboarding.profile.note_hint": "Man kan @omtale andre personer eller #hashtags…",
+  "onboarding.profile.note_hint": "Man kan @omtale andre personer eller #etiketter…",
   "onboarding.profile.save_and_continue": "Gem og fortsæt",
   "onboarding.profile.title": "Profilopsætning",
   "onboarding.profile.upload_avatar": "Upload profilbillede",
-  "onboarding.profile.upload_header": "Upload profiloverskrift",
+  "onboarding.profile.upload_header": "Upload profilbanner",
   "onboarding.share.lead": "Lad folk vide, hvordan de kan finde dig på Mastodon!",
   "onboarding.share.message": "Jeg er {username} på #Mastodon! Følg mig på {url}",
   "onboarding.share.next_steps": "Mulige næste trin:",
@@ -661,15 +664,15 @@
   "poll_button.add_poll": "Tilføj en afstemning",
   "poll_button.remove_poll": "Fjern afstemning",
   "privacy.change": "Tilpas indlægsfortrolighed",
-  "privacy.direct.long": "Alle nævnt i indlægget",
+  "privacy.direct.long": "Alle omtalt i indlægget",
   "privacy.direct.short": "Bestemte personer",
   "privacy.private.long": "Kun dine følgere",
   "privacy.private.short": "Følgere",
   "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i live feeds/hashtags, udforsk eller Mastodon-søgning, selv hvis valget gælder hele kontoen.",
+  "privacy.unlisted.additional": "Dette er præcis som offentlig adfærd, dog vises indlægget ikke i tidslinjer, under etiketter, udforsk eller Mastodon-søgning, selv hvis du ellers har sagt at dine opslag godt må være søgbare.",
   "privacy.unlisted.long": "Færre algoritmiske fanfarer",
-  "privacy.unlisted.short": "Tavsgøre offentligt",
+  "privacy.unlisted.short": "Stille offentligt",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "recommended": "Anbefalet",
@@ -704,12 +707,12 @@
   "report.comment.title": "Er der andet, som vi bør vide?",
   "report.forward": "Videresend til {target}",
   "report.forward_hint": "Kontoen er fra en anden server. Send også en anonymiseret kopi af anmeldelsen dertil?",
-  "report.mute": "Skjul (mute)",
+  "report.mute": "Skjul",
-  "report.mute_explanation": "Du vil ikke se vedkommendes indlæg. Vedkommende kan stadig se dine indlæg og følge dig. Vedkommende vil ikke kunne se, at de er blevet skjult.",
+  "report.mute_explanation": "Du vil ikke se deres indlæg. De kan stadig se dine indlæg og følge dig. De vil ikke kunne se, at de er blevet skjult.",
   "report.next": "Næste",
   "report.placeholder": "Yderligere kommentarer",
   "report.reasons.dislike": "Jeg bryder mig ikke om det",
-  "report.reasons.dislike_description": "Det er ikke noget, man ønsker at se",
+  "report.reasons.dislike_description": "Det er ikke noget, du ønsker at se",
   "report.reasons.legal": "Det er ulovligt",
   "report.reasons.legal_description": "Du mener, at det er i strid med lovgivningen i dit eller serverens land",
   "report.reasons.other": "Det er noget andet",
@@ -729,7 +732,7 @@
   "report.thanks.title": "Ønsker ikke at se dette?",
   "report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
   "report.unfollow": "Følg ikke længere @{name}",
-  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i dit hjemmefeed, kan du stoppe med at følge dem.",
+  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i din hjemmestrøm, kan du stoppe med at følge dem.",
   "report_notification.attached_statuses": "{count, plural, one {{count} post} other {{count} poster}} vedhæftet",
   "report_notification.categories.legal": "Juridisk",
   "report_notification.categories.legal_sentence": "ikke-tilladt indhold",
@@ -744,7 +747,7 @@
   "search.placeholder": "Søg",
   "search.quick_action.account_search": "Profiler matchende {x}",
   "search.quick_action.go_to_account": "Gå til profilen {x}",
-  "search.quick_action.go_to_hashtag": "Gå til hashtagget {x}",
+  "search.quick_action.go_to_hashtag": "Gå til etiketten {x}",
   "search.quick_action.open_url": "Åbn URL i Mastodon",
   "search.quick_action.status_search": "Indlæg matchende {x}",
   "search.search_or_paste": "Søg efter eller angiv URL",
@@ -758,7 +761,7 @@
   "search_popout.user": "bruger",
   "search_results.accounts": "Profiler",
   "search_results.all": "Alle",
-  "search_results.hashtags": "Hashtags",
+  "search_results.hashtags": "Etiketter",
   "search_results.nothing_found": "Ingen resultater for disse søgeord",
   "search_results.see_all": "Vis alle",
   "search_results.statuses": "Indlæg",
@@ -766,10 +769,10 @@
   "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
-  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fediverset.",
+  "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, man kan bruge for at deltage i fødiverset.",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
-  "sign_in_banner.follow_anyone": "Følg alle på tværs af fediverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
+  "sign_in_banner.follow_anyone": "Følg alle på tværs af fødiverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",
   "sign_in_banner.mastodon_is": "Mastodon er den bedste måde at holde sig ajour med, hvad der sker.",
   "sign_in_banner.sign_in": "Log ind",
   "sign_in_banner.sso_redirect": "Log ind eller Tilmeld",
@@ -778,7 +781,7 @@
   "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
   "status.block": "Blokér @{name}",
   "status.bookmark": "Bogmærk",
-  "status.cancel_reblog_private": "Fjern boost",
+  "status.cancel_reblog_private": "Fjern fremhævelse",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
   "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
@@ -801,23 +804,23 @@
   "status.media_hidden": "Medie skjult",
   "status.mention": "Nævn @{name}",
   "status.more": "Mere",
-  "status.mute": "Skjul @{name} (mute)",
+  "status.mute": "Skjul @{name}",
-  "status.mute_conversation": "Skjul samtale (mute)",
+  "status.mute_conversation": "Skjul samtale",
   "status.open": "Udvid dette indlæg",
   "status.pin": "Fastgør til profil",
   "status.pinned": "Fastgjort indlæg",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
-  "status.reblog_private": "Boost med oprindelig synlighed",
+  "status.reblog_private": "Fremhæv med oprindelig synlighed",
   "status.reblogged_by": "{name} fremhævede",
-  "status.reblogs": "{count, plural, one {# boost} other {# boosts}}",
+  "status.reblogs": "{count, plural, one {# fremhævelse} other {# fremhævelser}}",
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
   "status.redraft": "Slet og omformulér",
   "status.remove_bookmark": "Fjern bogmærke",
   "status.replied_in_thread": "Svaret i tråd",
-  "status.replied_to": "Besvarede {name}",
+  "status.replied_to": "Svarede {name}",
   "status.reply": "Besvar",
-  "status.replyAll": "Besvar alle",
+  "status.replyAll": "Svar alle",
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
@@ -879,8 +882,8 @@
   "video.expand": "Udvid video",
   "video.fullscreen": "Fuldskærm",
   "video.hide": "Skjul video",
-  "video.mute": "Sluk lyden",
+  "video.mute": "Sluk for lyden",
-  "video.pause": "Pausér",
+  "video.pause": "Sæt på pause",
   "video.play": "Afspil",
   "video.unmute": "Tænd for lyden"
 }

app/javascript/mastodon/locales/de.json

@@ -4,7 +4,7 @@
   "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Grund unbekannt",
   "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.",
-  "about.domain_blocks.silenced.explanation": "Alle Inhalte und Profile dieses Servers werden zunächst nicht angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
+  "about.domain_blocks.silenced.explanation": "Standardmäßig werden von diesem Server keine Inhalte oder Profile angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
   "about.domain_blocks.silenced.title": "Stummgeschaltet",
   "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.",
   "about.domain_blocks.suspended.title": "Gesperrt",
@@ -19,7 +19,7 @@
   "account.block_domain": "{domain} sperren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
-  "account.cancel_follow_request": "Folgeanfrage zurückziehen",
+  "account.cancel_follow_request": "Follower-Anfrage zurückziehen",
   "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
@@ -41,9 +41,9 @@
   "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.languages": "Sprache ändern.",
-  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
+  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} verifiziert",
   "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
   "account.media": "Medien",
   "account.mention": "@{name} erwähnen",
@@ -63,7 +63,7 @@
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Geteilte Beiträge von @{name} anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "Blockierung von @{name} aufheben",
+  "account.unblock": "{name} nicht mehr blockieren",
   "account.unblock_domain": "Blockierung von {domain} aufheben",
   "account.unblock_short": "Blockierung aufheben",
   "account.unendorse": "Im Profil nicht mehr empfehlen",
@@ -71,13 +71,13 @@
   "account.unmute": "Stummschaltung von @{name} aufheben",
   "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben",
   "account.unmute_short": "Stummschaltung aufheben",
-  "account_note.placeholder": "Notiz durch Klicken hinzufügen",
+  "account_note.placeholder": "Klicken, um Notiz hinzuzufügen",
-  "admin.dashboard.daily_retention": "Verweildauer der Benutzer*innen pro Tag nach der Registrierung",
+  "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag nach der Registrierung",
-  "admin.dashboard.monthly_retention": "Verweildauer der Benutzer*innen pro Monat nach der Registrierung",
+  "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat nach der Registrierung",
   "admin.dashboard.retention.average": "Durchschnitt",
   "admin.dashboard.retention.cohort": "Monat der Registrierung",
   "admin.dashboard.retention.cohort_size": "Neue Konten",
-  "admin.impact_report.instance_accounts": "Kontenprofile, die dadurch gelöscht würden",
+  "admin.impact_report.instance_accounts": "Profilkonten, die dadurch gelöscht würden",
   "admin.impact_report.instance_followers": "Follower, die unsere Nutzer*innen verlieren würden",
   "admin.impact_report.instance_follows": "Follower, die deren Nutzer*innen verlieren würden",
   "admin.impact_report.title": "Zusammenfassung der Auswirkung",
@@ -94,7 +94,7 @@
   "block_modal.show_more": "Mehr anzeigen",
   "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
   "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
-  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
+  "block_modal.they_will_know": "Das Profil wird erkennen können, dass du es blockiert hast.",
   "block_modal.title": "Profil blockieren?",
   "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
   "boost_modal.combo": "Mit {combo} erscheint dieses Fenster beim nächsten Mal nicht mehr",
@@ -154,10 +154,10 @@
   "compose_form.hashtag_warning": "Dieser Beitrag wird unter keinem Hashtag sichtbar sein, weil er nicht öffentlich ist. Nur öffentliche Beiträge können nach Hashtags durchsucht werden.",
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
-  "compose_form.placeholder": "Was gibt’s Neues?",
+  "compose_form.placeholder": "Was gibts Neues?",
   "compose_form.poll.duration": "Umfragedauer",
   "compose_form.poll.multiple": "Mehrfachauswahl",
-  "compose_form.poll.option_placeholder": "Option {number}",
+  "compose_form.poll.option_placeholder": "{number}. Auswahl",
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Profil entfolgen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
+  "content_warning.show_more": "Beitrag anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -232,7 +233,7 @@
   "domain_pill.their_server": "Deren digitale Heimat. Hier „leben“ alle Beiträge von diesem Profil.",
   "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "domain_pill.username": "Profilname",
-  "domain_pill.whats_in_a_handle": "Was ist Teil der Adresse?",
+  "domain_pill.whats_in_a_handle": "Woraus besteht eine Adresse?",
   "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
   "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
   "domain_pill.your_handle": "Deine Adresse:",
@@ -305,12 +306,12 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „<span>{title}</span>“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
-  "firehose.all": "Alles",
+  "firehose.all": "Alle Server",
   "firehose.local": "Dieser Server",
-  "firehose.remote": "Andere Server",
+  "firehose.remote": "Externe Server",
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
@@ -464,12 +465,12 @@
   "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
   "mute_modal.hide_options": "Einstellungen ausblenden",
   "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
-  "mute_modal.show_options": "Einstellungen anzeigen",
+  "mute_modal.show_options": "Optionen anzeigen",
   "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
-  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
+  "mute_modal.they_wont_know": "Das Profil wird nicht erkennen können, dass du es stummgeschaltet hast.",
   "mute_modal.title": "Profil stummschalten?",
   "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
-  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können von diesem stummgeschalteten Profil weiterhin gesehen werden, aber du wirst dessen Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
@@ -504,18 +505,19 @@
   "notification.admin.report_statuses": "{name} meldete {target} wegen {category}",
   "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
-  "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} registrierten sich",
+  "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weiteres Profil} other {# weitere Profile}} registrierten sich",
   "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.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</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 {# weiteres Profil} other {# weitere Profile}}</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.follow_request.name_and_others": "{name} und {count, plural, one {# weiteres Profil} other {# weitere Profile}} möchten dir folgen",
   "notification.label.mention": "Erwähnung",
   "notification.label.private_mention": "Private Erwähnung",
   "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.",
@@ -528,13 +530,13 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
-  "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> teilten deinen Beitrag",
+  "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> teilten deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
   "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} postete …",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Genehmigen",
   "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen …} other {# Anfragen genehmigen …}}",
@@ -566,6 +568,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",
@@ -596,15 +599,15 @@
   "notifications.policy.filter": "Filtern",
   "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
   "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
-  "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
+  "notifications.policy.filter_limited_accounts_title": "moderierten Konten",
   "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
-  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
+  "notifications.policy.filter_new_accounts_title": "neuen Konten",
   "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
   "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
   "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
   "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
-  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
+  "notifications.policy.filter_private_mentions_title": "unerwünschten privaten Erwähnungen",
   "notifications.policy.title": "Benachrichtigungen verwalten von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
@@ -662,7 +665,7 @@
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
   "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
-  "privacy.direct.short": "Bestimmte Profile",
+  "privacy.direct.short": "Ausgewählte Profile",
   "privacy.private.long": "Nur deine Follower",
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",

app/javascript/mastodon/locales/el.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "Συντονισμένοι διακομιστές",
+  "about.blocks": "Συντονιζόμενοι διακομιστές",
   "about.contact": "Επικοινωνία:",
   "about.disclaimer": "Το Mastodon είναι ελεύθερο λογισμικό ανοιχτού κώδικα και εμπορικό σήμα της Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Αιτιολογία μη διαθέσιμη",
@@ -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": "Απόκρυψη αρχείου ήχου",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Άρση ακολούθησης;",
   "content_warning.hide": "Απόκρυψη ανάρτησης",
   "content_warning.show": "Εμφάνιση ούτως ή άλλως",
+  "content_warning.show_more": "Εμφάνιση περισσότερων",
   "conversation.delete": "Διαγραφή συζήτησης",
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
@@ -221,6 +223,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 μιλάει με άλλα κοινωνικά δίκτυα.",
@@ -302,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
-  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “{title}”",
+  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
   "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",
@@ -382,9 +386,9 @@
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
   "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.",
-  "interaction_modal.login.action": "Take me home\nΠήγαινέ με στην αρχική σελίδα",
+  "interaction_modal.login.action": "Πήγαινέ με στην αρχική σελίδα",
   "interaction_modal.login.prompt": "Τομέας του οικιακού σου διακομιστή, πχ. mastodon.social",
-  "interaction_modal.no_account_yet": "Not on Mastodon?\nΔεν είστε στο Mastodon;",
+  "interaction_modal.no_account_yet": "Δεν είστε στο Mastodon;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
   "interaction_modal.sign_in": "Δεν είσαι συνδεδεμένος σε αυτόν το διακομιστή. Πού φιλοξενείται ο λογαριασμός σου;",
@@ -505,7 +509,7 @@
   "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.name_and_others": "Ο χρήστης {name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
@@ -513,6 +517,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 +568,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",
@@ -837,7 +843,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 {{counter} άτομο} other {{counter} άτομα} }{days, plural, one { την τελευταία ημέρα} other { τις τελευταίες {days} ημέρες}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άτομα}} {days, plural, one {την τελευταία ημέρα} other {τις τελευταίες {days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",
   "units.short.billion": "{count}Δις",
@@ -849,6 +855,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

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
+  "content_warning.show_more": "Show more",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filter_warning.matches_filter": "Matches filter “{title}”",
+  "filter_warning.matches_filter": "Matches filter \"<span>{title}</span>\"",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
@@ -508,7 +509,7 @@
   "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.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",
@@ -516,6 +517,7 @@
   "notification.label.private_reply": "Private reply",
   "notification.label.reply": "Reply",
   "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.",
@@ -566,6 +568,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.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
   "notifications.column_settings.push": "Push notifications",
@@ -791,7 +794,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 +855,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

@@ -291,6 +291,7 @@
   "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
+  "content_warning.show_more": "Show more",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -408,7 +409,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filter_warning.matches_filter": "Matches filter “{title}”",
+  "filter_warning.matches_filter": "Matches filter “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
@@ -625,7 +626,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 +635,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 +689,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

@@ -1,8 +1,8 @@
 {
-  "about.blocks": "Administritaj serviloj",
+  "about.blocks": "Reguligitaj serviloj",
   "about.contact": "Kontakto:",
   "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
+  "about.domain_blocks.no_reason_available": "Kialo ne disponeblas",
   "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
   "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
   "about.domain_blocks.silenced.title": "Limigita",
@@ -10,10 +10,10 @@
   "about.domain_blocks.suspended.title": "Suspendita",
   "about.not_available": "Ĉi tiu informo ne estas disponebla ĉe ĉi tiu servilo.",
   "about.powered_by": "Malcentrigita socia retejo pere de {mastodon}",
-  "about.rules": "Regularo de la servilo",
+  "about.rules": "Reguloj 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,11 +22,11 @@
   "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.endorse": "Prezenti ĉe via profilo",
   "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
   "account.featured_tags.last_status_never": "Neniu afiŝo",
   "account.featured_tags.title": "Rekomendataj kradvortoj de {name}",
@@ -45,18 +45,18 @@
   "account.languages": "Ŝanĝi la abonitajn lingvojn",
   "account.link_verified_on": "Propreco de tiu ligilo estis konfirmita je {date}",
   "account.locked_info": "Tiu konto estas privatigita. La posedanto mane akceptas tiun, kiu povas sekvi rin.",
-  "account.media": "Plurmedioj",
+  "account.media": "Aŭdovidaĵoj",
   "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",
@@ -142,7 +142,7 @@
   "column_header.unpin": "Malfiksi",
   "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
-  "community.column_settings.media_only": "Nur plurmedioj",
+  "community.column_settings.media_only": "Nur vidaŭdaĵoj",
   "community.column_settings.remote_only": "Nur fora",
   "compose.language.change": "Ŝanĝi lingvon",
   "compose.language.search": "Serĉi lingvojn...",
@@ -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,17 +173,17 @@
   "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?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
-  "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
+  "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭvidigo de la vidaŭdaĵo, ĉu vi forĵetu ilin malgraŭe?",
   "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",
@@ -197,8 +197,9 @@
   "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
+  "content_warning.show_more": "Montri pli",
   "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 +214,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": "Jen afiŝoj en la socia reto kiuj populariĝis hodiaŭ. Novaj afiŝoj kun pli da diskonigoj kaj stelumoj aperas 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 +248,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 +297,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,8 +305,8 @@
   "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}”",
+  "filter_warning.matches_filter": "Filtrilo de kongruoj “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
   "filtered_notifications_banner.title": "Filtritaj sciigoj",
   "firehose.all": "Ĉiuj",
@@ -332,7 +333,7 @@
   "followed_tags": "Sekvataj kradvortoj",
   "footer.about": "Pri",
   "footer.directory": "Profilujo",
-  "footer.get_app": "Akiru la Programon",
+  "footer.get_app": "Akiri la apon",
   "footer.invite": "Inviti homojn",
   "footer.keyboard_shortcuts": "Fulmoklavoj",
   "footer.privacy_policy": "Politiko de privateco",
@@ -343,7 +344,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 +352,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}}",
@@ -381,10 +382,10 @@
   "ignore_notifications_modal.not_followers_title": "Ĉu ignori sciigojn de homoj, kiuj ne sekvas vin?",
   "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.favourite": "Per konto ĉe Mastodon, vi povas stelumi ĉi tiun afiŝon por sciigi la afiŝanton ke vi sâtas kaj konservas ĝin por poste.",
-  "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 +400,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": "Malfermi vidaŭdaĵon",
-  "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ŭtoroprofilo",
-  "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.toggle_sensitivity": "Montri/kaŝi vidaŭdaĵojn",
-  "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 +477,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 +488,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",
@@ -505,10 +506,10 @@
   "notification.admin.report_statuses_other": "{name} raportis {target}",
   "notification.admin.sign_up": "{name} kreis konton",
   "notification.admin.sign_up.name_and_others": "{name} kaj {count, plural, one {# alia} other {# aliaj}} kreis konton",
-  "notification.favourite": "{name} stelumis vian afiŝon",
+  "notification.favourite": "{name} ŝatis 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,16 +517,17 @@
   "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": "Vi ricevis reguligan averton",
   "notification.moderation_warning.action_delete_statuses": "Kelkaj el viaj afiŝoj estis forigitaj.",
   "notification.moderation_warning.action_disable": "Via konto estas malŝaltita.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kelkaj el viaj afiŝoj estis markitaj kiel sentemaj.",
-  "notification.moderation_warning.action_none": "Via konto ricevis moderigan averton.",
+  "notification.moderation_warning.action_none": "Via konto ricevis reguligan averton.",
   "notification.moderation_warning.action_sensitive": "Viaj afiŝoj estos markitaj kiel sentemaj ekde nun.",
   "notification.moderation_warning.action_silence": "Via konto estis limigita.",
   "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
-  "notification.own_poll": "Via enketo finiĝis",
+  "notification.own_poll": "Via balotenketo finiĝitis",
   "notification.poll": "Balotenketo, en kiu vi voĉdonis, finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.reblog.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> diskonigis vian afiŝon",
@@ -548,8 +550,8 @@
   "notification_requests.dismiss_multiple": "{count, plural, one {Malakcepti # peton…} other {# Malakcepti # petojn…}}",
   "notification_requests.edit_selection": "Redakti",
   "notification_requests.exit_selection": "Farita",
-  "notification_requests.explainer_for_limited_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto estis limigita de moderanto.",
+  "notification_requests.explainer_for_limited_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto estis limigita de reguligisto.",
-  "notification_requests.explainer_for_limited_remote_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto aŭ ĝia servilo estis limigitaj de moderanto.",
+  "notification_requests.explainer_for_limited_remote_account": "Sciigoj de ĉi tiu konto estis filtritaj ĉar la konto aŭ ĝia servilo estis limigitaj de reguligisto.",
   "notification_requests.maximize": "Maksimumigi",
   "notification_requests.minimize_banner": "Minimumigi filtritajn sciigojn-rubandon",
   "notification_requests.notifications_from": "Sciigoj de {name}",
@@ -566,13 +568,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": "Grupigi",
   "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:",
@@ -595,8 +598,8 @@
   "notifications.policy.drop_hint": "Sendi al la malpleno, por neniam esti vidita denove",
   "notifications.policy.filter": "Filtri",
   "notifications.policy.filter_hint": "Sendi al filtritaj sciigoj-enirkesto",
-  "notifications.policy.filter_limited_accounts_hint": "Limigita de servilaj moderigantoj",
+  "notifications.policy.filter_limited_accounts_hint": "Limigita de servilaj reguligistoj",
-  "notifications.policy.filter_limited_accounts_title": "Moderigitaj kontoj",
+  "notifications.policy.filter_limited_accounts_title": "Reguligitaj kontoj",
   "notifications.policy.filter_new_accounts.hint": "Kreite en la {days, plural, one {lasta tago} other {# lastaj tagoj}}",
   "notifications.policy.filter_new_accounts_title": "Novaj kontoj",
   "notifications.policy.filter_not_followers_hint": "Inkluzive de homoj, kiuj sekvis vin malpli ol {days, plural, one {unu tago} other {# tagoj}}",
@@ -611,8 +614,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 +635,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.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.",
@@ -656,11 +659,11 @@
   "poll.total_people": "{count, plural, one {# homo} other {# homoj}}",
   "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll.vote": "Voĉdoni",
-  "poll.voted": "Vi elektis por ĉi tiu respondo",
+  "poll.voted": "Vi voĉdonis por ĉi tiu respondo",
   "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",
@@ -746,7 +749,7 @@
   "search.quick_action.go_to_account": "Iri al profilo {x}",
   "search.quick_action.go_to_hashtag": "Iri al kradvorto {x}",
   "search.quick_action.open_url": "Malfermi URL en Mastodono",
-  "search.quick_action.status_search": "Afiŝoj kiuj kongruas kun {x}",
+  "search.quick_action.status_search": "Afiŝoj kiuj konformas kun {x}",
   "search.search_or_paste": "Serĉu aŭ algluu URL-on",
   "search_popout.full_text_search_disabled_message": "Ne havebla sur {domain}.",
   "search_popout.full_text_search_logged_out_message": "Disponebla nur kiam ensalutinte.",
@@ -760,7 +763,7 @@
   "search_results.all": "Ĉiuj",
   "search_results.hashtags": "Kradvortoj",
   "search_results.nothing_found": "Povis trovi nenion por ĉi tiuj serĉaj terminoj",
-  "search_results.see_all": "Vidu ĉiujn",
+  "search_results.see_all": "Vidi ĉiujn",
   "search_results.statuses": "Afiŝoj",
   "search_results.title": "Serĉ-rezultoj por {q}",
   "server_banner.about_active_users": "Personoj uzantaj ĉi tiun servilon dum la lastaj 30 tagoj (Aktivaj Uzantoj Monate)",
@@ -769,19 +772,19 @@
   "server_banner.is_one_of_many": "{domain} estas unu el la multaj sendependaj Mastodon-serviloj, kiujn vi povas uzi por partopreni en la fediverso.",
   "server_banner.server_stats": "Statistikoj de la servilo:",
   "sign_in_banner.create_account": "Krei konton",
-  "sign_in_banner.follow_anyone": "Sekvi iun ajn tra la fediverso kaj vidi ĉion en kronologia ordo. Neniuj algoritmoj, reklamoj aŭ klakbetoj videblas.",
+  "sign_in_banner.follow_anyone": "Sekvu iun ajn tra la fediverso kaj vidu ĉion laŭ templinio. Nul algoritmo, reklamo aŭ kliklogilo ĉeestas.",
-  "sign_in_banner.mastodon_is": "Mastodonto estas la plej bona maniero por resti flank-al-flanke kun kio okazas.",
+  "sign_in_banner.mastodon_is": "Mastodon estas la plej bona maniero resti ĝisdata pri aktualaĵoj.",
-  "sign_in_banner.sign_in": "Saluti",
+  "sign_in_banner.sign_in": "Ensaluti",
   "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
-  "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
+  "status.admin_account": "Malfermi fasadon de la reguligado por @{name}",
-  "status.admin_domain": "Malfermu moderigan interfacon por {domain}",
+  "status.admin_domain": "Malfermi fasadon de la reguligado por {domain}",
-  "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
+  "status.admin_status": "Malfermi ĉi tiun afiŝon en la fasado de la reguligado",
   "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}",
@@ -798,14 +801,14 @@
   "status.load_more": "Ŝargi pli",
   "status.media.open": "Alklaki por malfermi",
   "status.media.show": "Alklaki por montri",
-  "status.media_hidden": "Plurmedio kaŝita",
+  "status.media_hidden": "Vidaŭdaĵo kaŝita",
   "status.mention": "Mencii @{name}",
   "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 +827,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 +850,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",
@@ -866,21 +869,21 @@
   "upload_modal.choose_image": "Elekti bildon",
   "upload_modal.description_placeholder": "Laŭ Ludoviko Zamenhof bongustas freŝa ĉeĥa manĝaĵo kun spicoj",
   "upload_modal.detect_text": "Detekti tekston de la bildo",
-  "upload_modal.edit_media": "Redakti la plurmedion",
+  "upload_modal.edit_media": "Redakti la vidaŭdaĵojn",
   "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

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar mensaje",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
@@ -249,7 +250,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",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
@@ -508,7 +509,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 +517,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 +568,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",
@@ -791,7 +794,7 @@
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Obtener código para insertar",
   "status.favourite": "Marcar como favorito",
-  "status.favourites": "{count, plural, one {# voto} other {# votos}}",
+  "status.favourites": "{count, plural, one {# vez marcado como favorito} other {# veces marcado como favorito}}",
   "status.filter": "Filtrar este mensaje",
   "status.history.created": "Creado por {name}, {date}",
   "status.history.edited": "Editado por {name}, {date}",
@@ -854,7 +857,7 @@
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
   "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
   "upload_form.edit": "Editar",

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

@@ -13,13 +13,13 @@
   "about.rules": "Reglas del servidor",
   "account.account_note_header": "Nota personal",
   "account.add_or_remove_from_list": "Agregar o eliminar de las listas",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatizada",
   "account.badges.group": "Grupo",
   "account.block": "Bloquear a @{name}",
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.cancel_follow_request": "Retirar solicitud de seguimiento",
+  "account.cancel_follow_request": "Cancelar seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada @{name}",
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
@@ -33,11 +33,11 @@
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
   "account.followers": "Seguidores",
-  "account.followers.empty": "Todavía nadie sigue a este usuario.",
+  "account.followers.empty": "Nadie sigue a este usuario todavía.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
   "account.following": "Siguiendo",
   "account.following_counter": "{count, plural, one {{counter} siguiendo} other {{counter} siguiendo}}",
-  "account.follows.empty": "Este usuario todavía no sigue a nadie.",
+  "account.follows.empty": "Este usuario no sigue a nadie todavía.",
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "En memoria.",
@@ -58,7 +58,7 @@
   "account.posts": "Publicaciones",
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Haga clic para cancelar la solicitud de seguimiento",
+  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
@@ -81,15 +81,15 @@
   "admin.impact_report.instance_followers": "Seguidores que nuestros usuarios perderían",
   "admin.impact_report.instance_follows": "Seguidores que perderían sus usuarios",
   "admin.impact_report.title": "Resumen de impacto",
-  "alert.rate_limited.message": "Por favor reintente después de {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Por favor, intenta después de las {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tarifa limitada",
   "alert.unexpected.message": "Hubo un error inesperado.",
-  "alert.unexpected.title": "¡Ups!",
+  "alert.unexpected.title": "¡Uy!",
   "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anuncio",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
-  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
+  "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloques de forma diferente. Las publicaciones públicas pueden ser todavía visibles para los usuarios no conectados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar más",
   "block_modal.they_cant_mention": "No pueden mencionarte ni seguirte.",
@@ -120,7 +120,7 @@
   "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.community": "Línea de tiempo local",
+  "column.community": "Cronología local",
   "column.direct": "Menciones privadas",
   "column.directory": "Buscar perfiles",
   "column.domain_blocks": "Dominios ocultados",
@@ -159,13 +159,13 @@
   "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": "Publicar",
-  "compose_form.publish_form": "Publicar",
+  "compose_form.publish_form": "Nueva publicación",
   "compose_form.reply": "Respuesta",
-  "compose_form.save_changes": "Actualización",
+  "compose_form.save_changes": "Actualizar",
   "compose_form.spoiler.marked": "Quitar advertencia de contenido",
   "compose_form.spoiler.unmarked": "Añadir advertencia de contenido",
   "compose_form.spoiler_placeholder": "Advertencia de contenido (opcional)",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -247,7 +248,7 @@
   "emoji_button.food": "Comida y bebida",
   "emoji_button.label": "Insertar emoji",
   "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "Sin emojis coincidentes",
+  "emoji_button.not_found": "No se han encontrado emojis que coincidan",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Gente",
   "emoji_button.recent": "Usados frecuentemente",
@@ -270,8 +271,8 @@
   "empty_column.follow_requests": "No tienes ninguna petición de seguidor. Cuando recibas una, se mostrará aquí.",
   "empty_column.followed_tags": "No estás siguiendo ninguna etiqueta todavía. Cuando lo hagas, aparecerá aquí.",
   "empty_column.hashtag": "No hay nada en esta etiqueta aún.",
-  "empty_column.home": "No estás siguiendo a nadie aún. Visita {public} o haz búsquedas para empezar y conocer gente nueva.",
+  "empty_column.home": "¡Tu cronología está vacía! Sigue a más gente para llenarla.",
-  "empty_column.list": "No hay nada en esta lista aún. Cuando miembros de esta lista publiquen nuevos estatus, estos aparecerán qui.",
+  "empty_column.list": "Aún no hay nada en esta lista. Cuando los miembros de esta lista publiquen nuevos contenidos, aparecerán aquí.",
   "empty_column.lists": "No tienes ninguna lista. cuando crees una, se mostrará aquí.",
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
   "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# people}} que puede que tú conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
@@ -399,40 +400,40 @@
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
-  "keyboard_shortcuts.back": "volver atrás",
+  "keyboard_shortcuts.back": "Volver atrás",
-  "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados",
+  "keyboard_shortcuts.blocked": "Abrir la lista de usuarios bloqueados",
   "keyboard_shortcuts.boost": "Impulsar publicación",
-  "keyboard_shortcuts.column": "enfocar un estado en una de las columnas",
+  "keyboard_shortcuts.column": "Enfocar columna",
-  "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
+  "keyboard_shortcuts.compose": "Enfocar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
   "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas",
-  "keyboard_shortcuts.down": "mover hacia abajo en la lista",
+  "keyboard_shortcuts.down": "Descender en la lista",
   "keyboard_shortcuts.enter": "Abrir publicación",
   "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
   "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
-  "keyboard_shortcuts.federated": "abrir el timeline federado",
+  "keyboard_shortcuts.federated": "Abrir cronología federada",
-  "keyboard_shortcuts.heading": "Keyboard Shortcuts",
+  "keyboard_shortcuts.heading": "Atajos de teclado",
-  "keyboard_shortcuts.home": "abrir el timeline propio",
+  "keyboard_shortcuts.home": "Abrir cronología principal",
-  "keyboard_shortcuts.hotkey": "Tecla caliente",
+  "keyboard_shortcuts.hotkey": "Tecla de acceso rápido",
-  "keyboard_shortcuts.legend": "para mostrar esta leyenda",
+  "keyboard_shortcuts.legend": "Mostrar esta leyenda",
-  "keyboard_shortcuts.local": "abrir el timeline local",
+  "keyboard_shortcuts.local": "Abrir cronología local",
-  "keyboard_shortcuts.mention": "para mencionar al autor",
+  "keyboard_shortcuts.mention": "Mencionar al autor",
-  "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados",
+  "keyboard_shortcuts.muted": "Abrir la lista de usuarios silenciados",
-  "keyboard_shortcuts.my_profile": "abrir tu perfil",
+  "keyboard_shortcuts.my_profile": "Abrir tu perfil",
-  "keyboard_shortcuts.notifications": "abrir la columna de notificaciones",
+  "keyboard_shortcuts.notifications": "Abrir la columna de notificaciones",
-  "keyboard_shortcuts.open_media": "para abrir archivos multimedia",
+  "keyboard_shortcuts.open_media": "Abrir multimedia",
   "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones fijadas",
-  "keyboard_shortcuts.profile": "abrir el perfil del autor",
+  "keyboard_shortcuts.profile": "Abrir perfil del autor",
   "keyboard_shortcuts.reply": "Responder a la publicación",
-  "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores",
+  "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
-  "keyboard_shortcuts.search": "para poner el foco en la búsqueda",
+  "keyboard_shortcuts.search": "Enfocar la barra de búsqueda",
-  "keyboard_shortcuts.spoilers": "para mostrar/ocultar el campo CW",
+  "keyboard_shortcuts.spoilers": "Mostrar/ocultar el campo AC",
-  "keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
+  "keyboard_shortcuts.start": "Abrir la columna “empezar”",
-  "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
+  "keyboard_shortcuts.toggle_hidden": "Mostrar/ocultar texto detrás de AC",
-  "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar medios",
+  "keyboard_shortcuts.toggle_sensitivity": "Mostrar/ocultar multimedia",
   "keyboard_shortcuts.toot": "Comenzar una nueva publicación",
-  "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda",
+  "keyboard_shortcuts.unfocus": "Desenfocar área de redacción/búsqueda",
-  "keyboard_shortcuts.up": "para ir hacia arriba en la lista",
+  "keyboard_shortcuts.up": "Ascender en la lista",
   "lightbox.close": "Cerrar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
@@ -508,7 +509,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 +517,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 +568,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",
@@ -586,7 +589,7 @@
   "notifications.grant_permission": "Conceder permiso.",
   "notifications.group": "{count} notificaciones",
   "notifications.mark_as_read": "Marcar todas las notificaciones como leídas",
-  "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
+  "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio, ya que se denegó el permiso",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
   "notifications.policy.accept": "Aceptar",
@@ -643,7 +646,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!",
@@ -799,7 +802,7 @@
   "status.media.open": "Click para abrir",
   "status.media.show": "Click para mostrar",
   "status.media_hidden": "Contenido multimedia oculto",
-  "status.mention": "Mencionar",
+  "status.mention": "Mencionar @{name}",
   "status.more": "Más",
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversación",
@@ -818,7 +821,7 @@
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
-  "status.report": "Reportar",
+  "status.report": "Reportar @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
@@ -842,21 +845,21 @@
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
-  "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",
+  "ui.beforeunload": "Tu borrador se perderá si abandonas Mastodon.",
   "units.short.billion": "{count} MM",
   "units.short.million": "{count} M",
   "units.short.thousand": "{count} K",
   "upload_area.title": "Arrastra y suelta para subir",
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Límite de subida de archivos excedido.",
-  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
+  "upload_error.poll": "No se permite subir archivos con las 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",
@@ -870,7 +873,7 @@
   "upload_modal.hint": "Haga clic o arrastre el círculo en la vista previa para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Vista previa ({ratio})",
-  "upload_progress.label": "Subiendo…",
+  "upload_progress.label": "Subiendo...",
   "upload_progress.processing": "Procesando…",
   "username.taken": "Ese nombre de usuario está ocupado. Prueba con otro",
   "video.close": "Cerrar video",

app/javascript/mastodon/locales/es.json

@@ -56,9 +56,9 @@
   "account.no_bio": "Sin biografía.",
   "account.open_original_page": "Abrir página original",
   "account.posts": "Publicaciones",
-  "account.posts_with_replies": "Pub. y respuestas",
+  "account.posts_with_replies": "Publicaciones y respuestas",
   "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación. Clica para cancelar la solicitud de seguimiento",
+  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
@@ -71,7 +71,7 @@
   "account.unmute": "Dejar de silenciar a @{name}",
   "account.unmute_notifications_short": "Dejar de silenciar notificaciones",
   "account.unmute_short": "Dejar de silenciar",
-  "account_note.placeholder": "Clic para añadir nota",
+  "account_note.placeholder": "Haz clic para añadir nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después del registro",
   "admin.dashboard.retention.average": "Media",
@@ -81,12 +81,12 @@
   "admin.impact_report.instance_followers": "Seguidores que nuestros usuarios perderían",
   "admin.impact_report.instance_follows": "Seguidores que perderían sus usuarios",
   "admin.impact_report.title": "Resumen de impacto",
-  "alert.rate_limited.message": "Por favor, vuelve a intentarlo después de la(s) {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Por favor, vuelve a intentarlo después de {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tráfico limitado",
   "alert.unexpected.message": "Hubo un error inesperado.",
   "alert.unexpected.title": "¡Ups!",
   "alt_text_badge.title": "Texto alternativo",
-  "announcement.announcement": "Anuncio",
+  "announcement.announcement": "Comunicación",
   "attachments_list.unprocessed": "(sin procesar)",
   "audio.hide": "Ocultar audio",
   "block_modal.remote_users_caveat": "Le pediremos al servidor {domain} que respete tu decisión. Sin embargo, el cumplimiento no está garantizado, ya que algunos servidores pueden manejar bloqueos de forma distinta. Los mensajes públicos pueden ser todavía visibles para los usuarios que no hayan iniciado sesión.",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
+  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -205,7 +206,7 @@
   "copypaste.copied": "Copiado",
   "copypaste.copy_to_clipboard": "Copiar al portapapeles",
   "directory.federated": "Desde el fediverso conocido",
-  "directory.local": "Solo de {domain}",
+  "directory.local": "Solo desde {domain}",
   "directory.new_arrivals": "Recién llegados",
   "directory.recently_active": "Recientemente activo",
   "disabled_account_banner.account_settings": "Ajustes de la cuenta",
@@ -247,7 +248,7 @@
   "emoji_button.food": "Comida y bebida",
   "emoji_button.label": "Insertar emoji",
   "emoji_button.nature": "Naturaleza",
-  "emoji_button.not_found": "No se encontró ningún emoji coincidente",
+  "emoji_button.not_found": "No se encontró ningún emoji que coincida",
   "emoji_button.objects": "Objetos",
   "emoji_button.people": "Personas",
   "emoji_button.recent": "Usados frecuentemente",
@@ -279,7 +280,7 @@
   "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
   "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
-  "error.unexpected_crash.next_steps": "Intenta actualizar la página. Si eso no ayuda, es posible que puedas usar Mastodon a través de otro navegador o aplicación nativa.",
+  "error.unexpected_crash.next_steps": "Intenta actualizar la página. Si eso no ayuda, quizás puedas usar Mastodon desde otro navegador o aplicación nativa.",
   "error.unexpected_crash.next_steps_addons": "Intenta deshabilitarlos y recarga la página. Si eso no ayuda, podrías usar Mastodon a través de un navegador web diferente o aplicación nativa.",
   "errors.unexpected_crash.copy_stacktrace": "Copiar el seguimiento de pila en el portapapeles",
   "errors.unexpected_crash.report_issue": "Informar de un problema/error",
@@ -294,7 +295,7 @@
   "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",
   "filter_modal.added.expired_title": "¡Filtro caducado!",
   "filter_modal.added.review_and_configure": "Para revisar y configurar esta categoría de filtros, vaya a {settings_link}.",
-  "filter_modal.added.review_and_configure_title": "Ajustes de filtro",
+  "filter_modal.added.review_and_configure_title": "Ajustes de filtros",
   "filter_modal.added.settings_link": "página de ajustes",
   "filter_modal.added.short_explanation": "Esta publicación ha sido añadida a la siguiente categoría de filtros: {title}.",
   "filter_modal.added.title": "¡Filtro añadido!",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
+  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
@@ -316,7 +317,7 @@
   "follow_requests.unlocked_explanation": "A pesar de que tu cuenta no es privada, el personal de {domain} ha pensado que quizás deberías revisar manualmente las solicitudes de seguimiento de estas cuentas.",
   "follow_suggestions.curated_suggestion": "Recomendaciones del equipo",
   "follow_suggestions.dismiss": "No mostrar de nuevo",
-  "follow_suggestions.featured_longer": "Escogidos por el equipo de {domain}",
+  "follow_suggestions.featured_longer": "Sugerencias del equipo de {domain}",
   "follow_suggestions.friends_of_friends_longer": "Populares entre las personas a las que sigues",
   "follow_suggestions.hints.featured": "Este perfil ha sido elegido a mano por el equipo de {domain}.",
   "follow_suggestions.hints.friends_of_friends": "Este perfil es popular entre las personas que sigues.",
@@ -343,11 +344,11 @@
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
-  "hashtag.column_settings.select.no_options_message": "No se encontraron sugerencias",
+  "hashtag.column_settings.select.no_options_message": "No se han encontrado sugerencias",
   "hashtag.column_settings.select.placeholder": "Introduce etiquetas…",
-  "hashtag.column_settings.tag_mode.all": "Todos estos",
+  "hashtag.column_settings.tag_mode.all": "Todas estas",
-  "hashtag.column_settings.tag_mode.any": "Cualquiera de estos",
+  "hashtag.column_settings.tag_mode.any": "Cualquiera de estas",
-  "hashtag.column_settings.tag_mode.none": "Ninguno de estos",
+  "hashtag.column_settings.tag_mode.none": "Ninguna de estas",
   "hashtag.column_settings.tag_toggle": "Incluir etiquetas adicionales en esta columna",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} participante} other {{counter} participantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
@@ -365,12 +366,12 @@
   "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
-  "home.hide_announcements": "Ocultar anuncios",
+  "home.hide_announcements": "Ocultar comunicaciones",
   "home.pending_critical_update.body": "Por favor, ¡actualiza tu servidor Mastodon lo antes posible!",
   "home.pending_critical_update.link": "Ver actualizaciones",
   "home.pending_critical_update.title": "¡Actualización de seguridad crítica disponible!",
-  "home.show_announcements": "Mostrar anuncios",
+  "home.show_announcements": "Mostrar comunicaciones",
-  "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
+  "ignore_notifications_modal.disclaimer": "Mastodon no puede informar a los usuarios de que has ignorado sus notificaciones. Ignorar notificaciones no impedirá que se sigan enviando los mensajes.",
   "ignore_notifications_modal.filter_instead": "Filtrar en vez de ignorar",
   "ignore_notifications_modal.filter_to_act_users": "Aún podrás aceptar, rechazar o reportar usuarios",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ayuda a evitar confusiones potenciales",
@@ -382,7 +383,7 @@
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
-  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu página de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
   "interaction_modal.login.action": "Ir a Inicio",
@@ -399,14 +400,14 @@
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
-  "keyboard_shortcuts.back": "volver atrás",
+  "keyboard_shortcuts.back": "Navegar hacia atrás",
-  "keyboard_shortcuts.blocked": "abrir una lista de usuarios bloqueados",
+  "keyboard_shortcuts.blocked": "Abrir lista de usuarios bloqueados",
   "keyboard_shortcuts.boost": "Impulsar",
   "keyboard_shortcuts.column": "Enfocar columna",
-  "keyboard_shortcuts.compose": "enfocar el área de texto de redacción",
+  "keyboard_shortcuts.compose": "Focalizar el área de texto de redacción",
   "keyboard_shortcuts.description": "Descripción",
   "keyboard_shortcuts.direct": "para abrir la columna de menciones privadas",
-  "keyboard_shortcuts.down": "mover hacia abajo en la lista",
+  "keyboard_shortcuts.down": "Moverse hacia abajo en la lista",
   "keyboard_shortcuts.enter": "Abrir publicación",
   "keyboard_shortcuts.favourite": "Marcar como favorita la publicación",
   "keyboard_shortcuts.favourites": "Abrir lista de favoritos",
@@ -416,23 +417,23 @@
   "keyboard_shortcuts.hotkey": "Tecla rápida",
   "keyboard_shortcuts.legend": "Mostrar esta leyenda",
   "keyboard_shortcuts.local": "Abrir cronología local",
-  "keyboard_shortcuts.mention": "mencionar al autor",
+  "keyboard_shortcuts.mention": "Mencionar autor",
-  "keyboard_shortcuts.muted": "abrir la lista de usuarios silenciados",
+  "keyboard_shortcuts.muted": "Abrir lista de usuarios silenciados",
-  "keyboard_shortcuts.my_profile": "abrir tu perfil",
+  "keyboard_shortcuts.my_profile": "Abrir tu perfil",
-  "keyboard_shortcuts.notifications": "abrir la columna de notificaciones",
+  "keyboard_shortcuts.notifications": "Abrir columna de notificaciones",
-  "keyboard_shortcuts.open_media": "para abrir archivos multimedia",
+  "keyboard_shortcuts.open_media": "Abrir multimedia",
   "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones destacadas",
-  "keyboard_shortcuts.profile": "abrir el perfil del autor",
+  "keyboard_shortcuts.profile": "Abrir perfil del autor",
-  "keyboard_shortcuts.reply": "para responder",
+  "keyboard_shortcuts.reply": "Responder a una publicación",
-  "keyboard_shortcuts.requests": "abrir la lista de peticiones de seguidores",
+  "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
-  "keyboard_shortcuts.search": "para poner el foco en la búsqueda",
+  "keyboard_shortcuts.search": "Focalizar barra de búsqueda",
-  "keyboard_shortcuts.spoilers": "para mostrar/ocultar el campo CW",
+  "keyboard_shortcuts.spoilers": "Mostrar/ocultar el campo de CW",
-  "keyboard_shortcuts.start": "abrir la columna \"comenzar\"",
+  "keyboard_shortcuts.start": "Abrir la columna \"comenzar\"",
-  "keyboard_shortcuts.toggle_hidden": "mostrar/ocultar texto tras aviso de contenido (CW)",
+  "keyboard_shortcuts.toggle_hidden": "Mostrar/ocultar texto tras aviso de contenido (CW)",
-  "keyboard_shortcuts.toggle_sensitivity": "mostrar/ocultar medios",
+  "keyboard_shortcuts.toggle_sensitivity": "Mostrar/ocultar multimedia",
-  "keyboard_shortcuts.toot": "Comienza una nueva publicación",
+  "keyboard_shortcuts.toot": "Comenzar una nueva publicación",
-  "keyboard_shortcuts.unfocus": "para retirar el foco de la caja de redacción/búsqueda",
+  "keyboard_shortcuts.unfocus": "Quitar el foco de la caja de redacción/búsqueda",
-  "keyboard_shortcuts.up": "para ir hacia arriba en la lista",
+  "keyboard_shortcuts.up": "Moverse hacia arriba en la lista",
   "lightbox.close": "Cerrar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
@@ -508,7 +509,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 +517,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 +568,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 votación:",
   "notifications.column_settings.push": "Notificaciones push",
@@ -586,7 +589,7 @@
   "notifications.grant_permission": "Conceder permiso.",
   "notifications.group": "{count} notificaciones",
   "notifications.mark_as_read": "Marcar todas las notificaciones como leídas",
-  "notifications.permission_denied": "No se pueden habilitar las notificaciones de escritorio ya que se denegó el permiso.",
+  "notifications.permission_denied": "Las notificaciones de escritorio no están disponibles porque se denegó el permiso del navegador previamente",
   "notifications.permission_denied_alert": "No se pueden habilitar las notificaciones de escritorio, ya que el permiso del navegador fue denegado anteriormente",
   "notifications.permission_required": "Las notificaciones de escritorio no están disponibles porque no se ha concedido el permiso requerido.",
   "notifications.policy.accept": "Aceptar",
@@ -612,11 +615,11 @@
   "onboarding.action.back": "Llévame atrás",
   "onboarding.actions.back": "Llévame atrás",
   "onboarding.actions.go_to_explore": "Llévame a tendencias",
-  "onboarding.actions.go_to_home": "Ir a mi inicio",
+  "onboarding.actions.go_to_home": "Ir a mi página de inicio",
   "onboarding.compose.template": "¡Hola #Mastodon!",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar personas a las que seguir, o inténtalo de nuevo más tarde.",
-  "onboarding.follows.lead": "Tu línea de inicio es la forma principal de experimentar Mastodon. Cuanta más personas sigas, más activa e interesante será. Para empezar, aquí hay algunas sugerencias:",
+  "onboarding.follows.lead": "Tu página de inicio es la forma principal de experimentar Mastodon. Cuanta más personas sigas, más activa e interesante será. Para empezar, aquí hay algunas sugerencias:",
-  "onboarding.follows.title": "Personaliza tu línea de inicio",
+  "onboarding.follows.title": "Personaliza tu página de inicio",
   "onboarding.profile.discoverable": "Hacer que mi perfil aparezca en búsquedas",
   "onboarding.profile.discoverable_hint": "Cuando permites que tu perfil aparezca en búsquedas en Mastodon, tus publicaciones podrán aparecer en los resultados de búsqueda y en tendencias, y tu perfil podrá recomendarse a gente con intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre para mostrar",
@@ -636,7 +639,7 @@
   "onboarding.start.skip": "¿No necesitas ayuda para empezar?",
   "onboarding.start.title": "¡Lo has logrado!",
   "onboarding.steps.follow_people.body": "Seguir personas interesante es de lo que trata Mastodon.",
-  "onboarding.steps.follow_people.title": "Personaliza tu línea de inicio",
+  "onboarding.steps.follow_people.title": "Personaliza tu página de inicio",
   "onboarding.steps.publish_status.body": "Di hola al mundo con texto, fotos, vídeos o encuestas {emoji}",
   "onboarding.steps.publish_status.title": "Escribe tu primera publicación",
   "onboarding.steps.setup_profile.body": "Aumenta tus interacciones con un perfil completo.",
@@ -675,7 +678,7 @@
   "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
-  "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
+  "regeneration_indicator.sublabel": "¡Tu página de inicio se está preparando!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
@@ -729,7 +732,7 @@
   "report.thanks.title": "¿No quieres esto?",
   "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
   "report.unfollow": "Dejar de seguir a @{name}",
-  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para dejar de ver sus publicaciones en tu página de inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "contenido ilegal",
@@ -799,7 +802,7 @@
   "status.media.open": "Pulsa para abrir",
   "status.media.show": "Pulsa para mostrar",
   "status.media_hidden": "Contenido multimedia oculto",
-  "status.mention": "Mencionar",
+  "status.mention": "Mencionar a @{name}",
   "status.more": "Más",
   "status.mute": "Silenciar @{name}",
   "status.mute_conversation": "Silenciar conversación",
@@ -818,7 +821,7 @@
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
-  "status.report": "Reportar",
+  "status.report": "Reportar a @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
@@ -847,7 +850,7 @@
   "units.short.million": "{count} M",
   "units.short.thousand": "{count} K",
   "upload_area.title": "Arrastra y suelta para subir",
-  "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
+  "upload_button.label": "Añadir imágenes, un fichero de vídeo o de audio",
   "upload_error.limit": "Límite de subida de archivos excedido.",
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
   "upload_form.audio_description": "Describir para personas con problemas auditivos",
@@ -870,7 +873,7 @@
   "upload_modal.hint": "Haga clic o arrastre el círculo en la vista previa para elegir el punto focal que siempre estará a la vista en todas las miniaturas.",
   "upload_modal.preparing_ocr": "Preparando OCR…",
   "upload_modal.preview_label": "Vista previa ({ratio})",
-  "upload_progress.label": "Subiendo…",
+  "upload_progress.label": "Subiendo...",
   "upload_progress.processing": "Procesando…",
   "username.taken": "Ese nombre de usuario ya está en uso. Prueba con otro",
   "video.close": "Cerrar video",

app/javascript/mastodon/locales/et.json

@@ -12,7 +12,7 @@
   "about.powered_by": "Hajutatud sotsiaalmeedia, mille taga on {mastodon}",
   "about.rules": "Serveri reeglid",
   "account.account_note_header": "Isiklik märge",
-  "account.add_or_remove_from_list": "Lisa või Eemalda nimekirjadest",
+  "account.add_or_remove_from_list": "Lisa või Eemalda loeteludest",
   "account.badges.bot": "Robot",
   "account.badges.group": "Grupp",
   "account.block": "Blokeeri @{name}",
@@ -52,7 +52,7 @@
   "account.mute_notifications_short": "Vaigista teavitused",
   "account.mute_short": "Vaigista",
   "account.muted": "Vaigistatud",
-  "account.mutual": "Ühine",
+  "account.mutual": "Jälgite",
   "account.no_bio": "Kirjeldust pole lisatud.",
   "account.open_original_page": "Ava algne leht",
   "account.posts": "Postitused",
@@ -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",
@@ -127,7 +128,7 @@
   "column.firehose": "Laiv lõimed",
   "column.follow_requests": "Jälgimistaotlused",
   "column.home": "Kodu",
-  "column.lists": "Nimekirjad",
+  "column.lists": "Loetelud",
   "column.mutes": "Vaigistatud kasutajad",
   "column.notifications": "Teated",
   "column.pins": "Kinnitatud postitused",
@@ -145,7 +146,7 @@
   "community.column_settings.remote_only": "Ainult kaug",
   "compose.language.change": "Muuda keelt",
   "compose.language.search": "Otsi keeli...",
-  "compose.published.body": "Postitus avaldatud.",
+  "compose.published.body": "Postitus tehtud.",
   "compose.published.open": "Ava",
   "compose.saved.body": "Postitus salvestatud.",
   "compose_form.direct_message_warning_learn_more": "Vaata lisa",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
   "content_warning.hide": "Peida postitus",
   "content_warning.show": "Näita ikkagi",
+  "content_warning.show_more": "Näita rohkem",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
@@ -221,6 +223,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.",
@@ -269,7 +273,7 @@
   "empty_column.hashtag": "Selle sildi all ei ole ühtegi postitust.",
   "empty_column.home": "Su koduajajoon on tühi. Jälgi rohkemaid inimesi, et seda täita {suggestions}",
   "empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
-  "empty_column.lists": "Pole veel ühtegi nimekirja. Kui lood mõne, näed neid siin.",
+  "empty_column.lists": "Pole veel ühtegi loetelu. Kui lood mõne, näed neid siin.",
   "empty_column.mutes": "Sa pole veel ühtegi kasutajat vaigistanud.",
   "empty_column.notification_requests": "Kõik tühi! Siin pole mitte midagi. Kui saad uusi teavitusi, ilmuvad need siin vastavalt sinu seadistustele.",
   "empty_column.notifications": "Ei ole veel teateid. Kui keegi suhtleb sinuga, näed seda siin.",
@@ -302,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
-  "filter_warning.matches_filter": "Sobib filtriga “{title}”",
+  "filter_warning.matches_filter": "Sobib filtriga “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Mitte üheltki inimeselt} one {Ühelt inimeselt} other {# inimeselt}}, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
@@ -321,7 +325,7 @@
   "follow_suggestions.hints.most_interactions": "See kasutajaprofiil on viimasel ajal {domain} saanud palju tähelepanu.",
   "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
   "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
-  "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
+  "follow_suggestions.popular_suggestion": "Populaarne soovitus",
   "follow_suggestions.popular_suggestion_longer": "Populaarne kohas {domain}",
   "follow_suggestions.similar_to_recently_followed_longer": "Sarnane profiilile, mida hiljuti jälgima hakkasid",
   "follow_suggestions.view_all": "Vaata kõiki",
@@ -397,7 +401,7 @@
   "intervals.full.hours": "{number, plural, one {# tund} other {# tundi}}",
   "intervals.full.minutes": "{number, plural, one {# minut} other {# minutit}}",
   "keyboard_shortcuts.back": "Liigu tagasi",
-  "keyboard_shortcuts.blocked": "avamaks blokeeritud kasutajate nimistut",
+  "keyboard_shortcuts.blocked": "Ava blokeeritud kasutajate nimistu",
   "keyboard_shortcuts.boost": "Jaga",
   "keyboard_shortcuts.column": "Fookus veerule",
   "keyboard_shortcuts.compose": "Fookus teksti koostamise alale",
@@ -433,25 +437,27 @@
   "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",
   "link_preview.more_from_author": "Veel kasutajalt {name}",
   "link_preview.shares": "{count, plural, one {{counter} postitus} other {{counter} postitust}}",
-  "lists.account.add": "Lisa nimekirja",
+  "lists.account.add": "Lisa loetellu",
-  "lists.account.remove": "Eemalda nimekirjast",
+  "lists.account.remove": "Eemalda loetelust",
-  "lists.delete": "Kustuta nimekiri",
+  "lists.delete": "Kustuta loetelu",
-  "lists.edit": "Muuda nimekirja",
+  "lists.edit": "Muuda loetelu",
   "lists.edit.submit": "Pealkirja muutmine",
   "lists.exclusive": "Peida koduvaatest need postitused",
-  "lists.new.create": "Lisa nimekiri",
+  "lists.new.create": "Lisa loetelu",
-  "lists.new.title_placeholder": "Uue nimekirja pealkiri",
+  "lists.new.title_placeholder": "Uue loetelu pealkiri",
   "lists.replies_policy.followed": "Igalt jälgitud kasutajalt",
-  "lists.replies_policy.list": "Listi liikmetelt",
+  "lists.replies_policy.list": "Loetelu liikmetelt",
   "lists.replies_policy.none": "Mitte kelleltki",
   "lists.replies_policy.title": "Näita vastuseid nendele:",
   "lists.search": "Otsi enda jälgitavate inimeste hulgast",
-  "lists.subheading": "Sinu nimekirjad",
+  "lists.subheading": "Sinu loetelud",
   "load_pending": "{count, plural, one {# uus kirje} other {# uut kirjet}}",
   "loading_indicator.label": "Laadimine…",
   "media_gallery.hide": "Peida",
@@ -481,7 +487,7 @@
   "navigation_bar.follow_requests": "Jälgimistaotlused",
   "navigation_bar.followed_tags": "Jälgitavad märksõnad",
   "navigation_bar.follows_and_followers": "Jälgitavad ja jälgijad",
-  "navigation_bar.lists": "Nimekirjad",
+  "navigation_bar.lists": "Loetelud",
   "navigation_bar.logout": "Logi välja",
   "navigation_bar.moderation": "Modereerimine",
   "navigation_bar.mutes": "Vaigistatud kasutajad",
@@ -503,7 +509,7 @@
   "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.name_and_others": "{name} ja veel {count, plural, one {# kasutaja} other {# kasutajat}} 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 +517,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.",
@@ -561,6 +568,7 @@
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
+  "notifications.column_settings.group": "Grupp",
   "notifications.column_settings.mention": "Mainimised:",
   "notifications.column_settings.poll": "Küsitluse tulemused:",
   "notifications.column_settings.push": "Push teated",
@@ -847,6 +855,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

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
   "content_warning.hide": "Tuta ezkutatu",
   "content_warning.show": "Erakutsi hala ere",
+  "content_warning.show_more": "Erakutsi gehiago",
   "conversation.delete": "Ezabatu elkarrizketa",
   "conversation.mark_as_read": "Markatu irakurrita bezala",
   "conversation.open": "Ikusi elkarrizketa",
@@ -268,7 +269,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.",
@@ -303,7 +304,7 @@
   "filter_modal.select_filter.subtitle": "Hautatu lehendik dagoen kategoria bat edo sortu berria",
   "filter_modal.select_filter.title": "Iragazi bidalketa hau",
   "filter_modal.title.status": "Iragazi bidalketa bat",
-  "filter_warning.matches_filter": "“{title}” iragazkiarekin bat dator",
+  "filter_warning.matches_filter": "“<span>{title}</span>” iragazkiarekin bat dator",
   "filtered_notifications_banner.pending_requests": "Ezagutu dezakezun {count, plural, =0 {inoren} one {pertsona baten} other {# pertsonen}}",
   "filtered_notifications_banner.title": "Iragazitako jakinarazpenak",
   "firehose.all": "Guztiak",
@@ -504,7 +505,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 +597,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

@@ -145,7 +145,7 @@
   "community.column_settings.media_only": "فقط رسانه",
   "community.column_settings.remote_only": "تنها دوردست",
   "compose.language.change": "تغییر زبان",
-  "compose.language.search": "جست‌وجوی زبان‌ها…",
+  "compose.language.search": "جست‌وجوی زبان‌ها...",
   "compose.published.body": "فرسته منتشر شد.",
   "compose.published.open": "گشودن",
   "compose.saved.body": "فرسته ذخیره شد.",
@@ -196,7 +196,8 @@
   "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
   "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
   "content_warning.hide": "نهفتن فرسته",
-  "content_warning.show": "نمایش به هر روی",
+  "content_warning.show": "در هر صورت نشان داده شود",
+  "content_warning.show_more": "نمایش بیش‌تر",
   "conversation.delete": "حذف گفتگو",
   "conversation.mark_as_read": "علامت‌گذاری به عنوان خوانده شده",
   "conversation.open": "دیدن گفتگو",
@@ -222,6 +223,7 @@
   "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": "این به شما اجازه می‌دهد تا نه تنها در ماستودون، بلکه در برنامه‌های اجتماعی مختلف نیز با افراد ارتباط برقرار کرده و تعامل داشته باشید.",
@@ -269,10 +271,11 @@
   "empty_column.follow_requests": "شما هنوز هیچ درخواست پی‌گیری‌ای ندارید. هنگامی که چنین درخواستی بگیرید، این‌جا نشان داده خواهد شد.",
   "empty_column.followed_tags": "شما هیچ برچسبی را پی‌نگرفتید. هنگامی که برچسبی را پی‌گیری کنید اینجا نمایان می‌شوند.",
   "empty_column.hashtag": "هنوز هیچ چیزی در این برچسب نیست.",
-  "empty_column.home": "خط زمانی خانگیتان خالی است! برای پر کردنش، افراد بیشتری را پی بگیرید. {suggestions}",
+  "empty_column.home": "خط زمانی خانگیتان خالی است! برای پر کردنش، افراد بیشتری را پی بگیرید.",
   "empty_column.list": "هنوز چیزی در این سیاهه نیست. هنگامی که اعضایش فرسته‌های جدیدی بفرستند، این‌جا ظاهر خواهند شد.",
   "empty_column.lists": "هنوز هیچ سیاهه‌ای ندارید. هنگامی که یکی بسازید، این‌جا نشان داده خواهد شد.",
   "empty_column.mutes": "هنوز هیچ کاربری را خموش نکرده‌اید.",
+  "empty_column.notification_requests": "همه چیز تمیز است! هیچ‌چیزی این‌جا نیست. هنگامی که آگاهی‌های جدیدی دریافت کنید، بسته به تنظیماتتان این‌جا ظاهر خواهند شد.",
   "empty_column.notifications": "هنوز هیچ آگاهی‌آی ندارید. هنگامی که دیگران با شما برهم‌کنش داشته باشند،‌این‌حا خواهید دیدش.",
   "empty_column.public": "این‌جا هنوز چیزی نیست! خودتان چیزی بنویسید یا کاربران کارسازهای دیگر را پی‌گیری کنید تا این‌جا پُر شود",
   "error.unexpected_crash.explanation": "به خاطر اشکالی در کدهای ما یا ناسازگاری با مرورگر شما، این صفحه به درستی نمایش نیافت.",
@@ -303,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "استفاده از یک دستهً موجود یا ایجاد دسته‌ای جدید",
   "filter_modal.select_filter.title": "پالایش این فرسته",
   "filter_modal.title.status": "پالایش یک فرسته",
-  "filter_warning.matches_filter": "مطابق با پالایهٔ «{title}»",
+  "filter_warning.matches_filter": "مطابق با پالایهٔ «<span>{title}</span>»",
   "filtered_notifications_banner.pending_requests": "از {count, plural, =0 {هیچ‌کسی} one {فردی} other {# نفر}} که ممکن است بشناسید",
   "filtered_notifications_banner.title": "آگاهی‌های پالوده",
   "firehose.all": "همه",
@@ -368,11 +371,17 @@
   "home.pending_critical_update.link": "دیدن به‌روز رسانی‌ها",
   "home.pending_critical_update.title": "به‌روز رسانی امنیتی بحرانی موجود است!",
   "home.show_announcements": "نمایش اعلامیه‌ها",
+  "ignore_notifications_modal.disclaimer": "ماستودون نمی تواند به کاربران اطلاع دهد که اعلان های آنها را نادیده گرفته اید. نادیده گرفتن اعلان ها مانع از ارسال خود پیام ها نمی شود.",
+  "ignore_notifications_modal.filter_instead": "به جایش پالوده شود",
+  "ignore_notifications_modal.filter_to_act_users": "همچنان می‌توانید کاربران را بپذیرید، رد کنید یا گزارش دهید",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "فیلتر کردن به جلوگیری از سردرگمی احتمالی کمک می کند",
+  "ignore_notifications_modal.filter_to_review_separately": "می توانید اعلان های فیلتر شده را به طور جداگانه بررسی کنید",
   "ignore_notifications_modal.ignore": "چشم‌پوشی از آگاهی‌ها",
   "ignore_notifications_modal.limited_accounts_title": "چشم‌پوشی از آگاهی‌های حساب‌های نظارت شده؟",
   "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": "با حسابی روی ماستودون می‌توانید این فرسته را با پی‌گیران خودتان هم‌رسانی کنید.",
@@ -383,7 +392,7 @@
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
   "interaction_modal.sign_in": "شما در این کارساز وارد نشده‌اید. حسابتان کجا میزبانی شده؟",
-  "interaction_modal.sign_in_hint": "نکته: میزبانتان، پایگاه وبیست که رویش ثبت‌نام کرده‌اید. اگر به خاطر نمی‌آورید، به رایانامهٔ خوش‌آمد در صندوق ورودیتان بنگرید. همچنین می‌توانید نام کاربری کاملتان (چون ‪@Mastodon@mastodon.social‬) را وارد کنید!",
+  "interaction_modal.sign_in_hint": "نکته: میزبانتان، پایگاه وبیست که رویش ثبت‌نام کرده‌اید. اگر به خاطر نمی‌آورید، به رایانامهٔ خوش‌آمد در صندوق ورودیتان بنگرید. همچنین می‌توانید نام کاربری کاملتان را وارد کنید! (مانند ‪@Mastodon@mastodon.social‬)",
   "interaction_modal.title.favourite": "فرسته‌های برگزیدهٔ {name}",
   "interaction_modal.title.follow": "پیگیری {name}",
   "interaction_modal.title.reblog": "تقویت فرستهٔ {name}",
@@ -428,6 +437,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}",
@@ -455,6 +466,7 @@
   "mute_modal.hide_options": "گزینه‌های نهفتن",
   "mute_modal.indefinite": "تا وقتی ناخموشش کنم",
   "mute_modal.show_options": "نمایش گزینه‌ها",
+  "mute_modal.they_can_mention_and_follow": "می‌توانند به شما اشاره کرده و پیتان بگیرند، ولی نخواهید دیدشان.",
   "mute_modal.they_wont_know": "نخواهند دانست که خموش شده‌اند.",
   "mute_modal.title": "خموشی کاربر؟",
   "mute_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
@@ -488,13 +500,16 @@
   "navigation_bar.security": "امنیت",
   "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
   "notification.admin.report": "{name}، {target} را گزارش داد",
+  "notification.admin.report_account": "{name} {count, plural, one {یک پست} other {پست}} از {target} برای {category} را گزارش داد",
+  "notification.admin.report_account_other": "{name} {count, plural, one {یک پست} other {پست}} از {target} را گزارش داد",
+  "notification.admin.report_statuses": "{name} {target} برای {category} را گزارش داد",
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
   "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
   "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, other {#}} نفر دیگر</a> پیتان گرفتند",
   "notification.follow_request": "{name} درخواست پی‌گیریتان را داد",
   "notification.follow_request.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} درخواست پی‌گیریتان را دادند",
   "notification.label.mention": "اشاره",
@@ -502,6 +517,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": "برخی از فرسته‌هایتان برداشته شدند.",
@@ -516,15 +532,26 @@
   "notification.reblog": "‫{name}‬ فرسته‌تان را تقویت کرد",
   "notification.reblog.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را تقویت کردند",
   "notification.relationships_severance_event": "قطع ارتباط با {name}",
+  "notification.relationships_severance_event.account_suspension": "یک سرپرست از {from} {target} را به حالت تعلیق درآورده است، به این معنی که دیگر نمی‌توانید به‌روزرسانی‌ها را از آنها دریافت کنید یا با آنها تعامل داشته باشید.",
+  "notification.relationships_severance_event.domain_block": "یک سرپرست از {from} {target} را مسدود کرده است، از جمله {followersCount} از دنبال‌کنندگان شما و {followingCount, plural, one {حساب} other {حساب‌}} که دنبال می‌کنید.",
   "notification.relationships_severance_event.learn_more": "بیشتر بدانید",
+  "notification.relationships_severance_event.user_domain_block": "شما {target} را مسدود کرده‌اید، {followersCount} از دنبال‌کنندگان خود و {followingCount, plural, one {حساب} other {حساب}} که دنبال می‌کنید را حذف کرده‌اید.",
   "notification.status": "{name} چیزی فرستاد",
   "notification.update": "{name} فرسته‌ای را ویرایش کرد",
   "notification_requests.accept": "پذیرش",
+  "notification_requests.accept_multiple": "{count, plural, one {پذیرش درخواست…} other {پذیرش درخواست‌ها…}}",
+  "notification_requests.confirm_accept_multiple.button": "پذیرش {count, plural,one {درخواست} other {درخواست‌ها}}",
+  "notification_requests.confirm_accept_multiple.message": "در حال پذیرش {count, plural,one {یک}other {#}} درخواست آگاهی هستید. مطمئنید که می‌خواهید ادامه دهید؟",
   "notification_requests.confirm_accept_multiple.title": "پذیرش درخواست‌های آگاهی؟",
+  "notification_requests.confirm_dismiss_multiple.button": "رد {count, plural,one {درخواست} other {درخواست‌ها}}",
+  "notification_requests.confirm_dismiss_multiple.message": "شما در شرف رد کردن {count, plural, one {یک درخواست آگاهی} other {درخواست آگاهی}} هستید. دیگر نمی توانید به راحتی به {count, plural, one {آن} other {آن‌ها}} دسترسی پیدا کنید. آیا مطمئن هستید که می خواهید ادامه دهید؟",
   "notification_requests.confirm_dismiss_multiple.title": "رد کردن درخواست‌های آگاهی؟",
   "notification_requests.dismiss": "دورانداختن",
+  "notification_requests.dismiss_multiple": "{count, plural, one {دورانداختن درخواست…} other {دورانداختن درخواست‌ها…}}",
   "notification_requests.edit_selection": "ویرایش",
   "notification_requests.exit_selection": "انجام شد",
+  "notification_requests.explainer_for_limited_account": "اعلان‌های این حساب فیلتر شده‌اند زیرا حساب توسط یک ناظر محدود شده است.",
+  "notification_requests.explainer_for_limited_remote_account": "اعلان‌های این حساب فیلتر شده‌اند زیرا حساب یا سرور آن توسط ناظر محدود شده است.",
   "notification_requests.maximize": "بیشنه",
   "notification_requests.minimize_banner": "کمینه کردن بیرق آگاهی‌های پالوده",
   "notification_requests.notifications_from": "آگاهی‌ها از {name}",
@@ -541,6 +568,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": "آگاهی‌های ارسالی",
@@ -554,7 +582,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 +600,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} بالا واپایید.",
@@ -586,13 +618,13 @@
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "سلام #ماستودون!",
   "onboarding.follows.empty": "متأسفانه هم‌اکنون نتیجه‌ای قابل نمایش نیست. می‌توانید استفاده از جست‌وجو یا مرور صفحهٔ کاوش را برای یافتن افرادی برای پی‌گیری آزموده یا دوباره تلاش کنید.",
-  "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.profile.discoverable": "نمایه خود را قابل نمایش کنید",
   "onboarding.profile.discoverable_hint": "خواسته‌اید روی ماستودون کشف شوید. ممکن است فرسته‌هایتان در نتیحهٔ جست‌وجوها و فرسته‌های داغ ظاهر شده و نمایه‌تان به افرادی با علایق مشابهتان پیشنهاد شود.",
   "onboarding.profile.display_name": "نام نمایشی",
   "onboarding.profile.display_name_hint": "نام کامل یا نام باحالتان…",
-  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌ّای شخصی سازی بیش‌تری نیز دارد کامل کنید.",
+  "onboarding.profile.lead": "همواره می‌توانید این مورد را در تنظیمات که گزینه‌های شخصی سازی بیش‌تری نیز دارد کامل کنید.",
   "onboarding.profile.note": "درباره شما",
   "onboarding.profile.note_hint": "می‌توانید افراد دیگر را @نام‌بردن یا #برچسب بزنید…",
   "onboarding.profile.save_and_continue": "ذخیره کن و ادامه بده",
@@ -603,17 +635,17 @@
   "onboarding.share.message": "من {username} روی #ماستودون هستم! مرا در {url} پی‌بگیرید",
   "onboarding.share.next_steps": "گام‌های ممکن بعدی:",
   "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.lead": "شما اکنون بخشی از ماستودون هستید، یک پلتفرم رسانه اجتماعی منحصر به فرد و غیرمتمرکز که در آن شما - نه یک الگوریتم - تجربه خود را مدیریت می کنید. بیایید شما را در این مرز اجتماعی جدید شروع کنیم:",
-  "onboarding.start.skip": "Want to skip right ahead?",
+  "onboarding.start.skip": "برای شروع به کمک نیاز ندارید؟",
   "onboarding.start.title": "انجامش دادید!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "دنبال کردن افراد جالب هدف ماستودون است.",
-  "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.publish_status.body": "با متن، عکس، ویدیو یا نظرسنجی به دنیا سلام کنید {emoji}",
   "onboarding.steps.publish_status.title": "نخستین فرسته‌تان را بنویسید",
-  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
+  "onboarding.steps.setup_profile.body": "با داشتن یک نمایه جامع، تعاملات خود را تقویت کنید.",
-  "onboarding.steps.setup_profile.title": "Customize your profile",
+  "onboarding.steps.setup_profile.title": "پروفایل خود را شخصی سازی کنید",
-  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+  "onboarding.steps.share_profile.body": "به دوستان خود اطلاع دهید که چگونه شما را در ماستودون پیدا کنند",
-  "onboarding.steps.share_profile.title": "Share your profile",
+  "onboarding.steps.share_profile.title": "نمایه ماستودون خود را به اشتراک بگذارید",
   "onboarding.tips.2fa": "<strong>آیا می‌دانستید؟</strong> می‌توانید با پریایی هویت‌سنجی دو عاملی در تنظیمات حساب، حسابتان را ایمن کنید؟ این قابلیت با هر نرم‌افزار TOTP دلخواه کار کرده و نیازی به شماره تلفن ندارد!",
   "onboarding.tips.accounts_from_other_servers": "<strong>آیا می‌دانستید؟</strong> از آن‌جا که ماستودون نامتمرکز است، برخی نمایه‌ها که به آن‌ها برمی‌خورید روی کارسازهایی متفاوت از شما میزبانی می‌شوند و باز هم می‌توانید بدون مشکل با آن‌ها تعامل داشته باشید! کارسازشان در نیمه دوم نام کاربریشان است!",
   "onboarding.tips.migration": "<strong>آیا می‌دانستید؟</strong> اگر احساس می‌کنید {domain} انتخاب کارساز خوبی برای آینده‌تان نیست، می‌توانید بدون از دست دادن پیگیرهایتان به کارساز ماستودون دیگری مهاجرت کنید. حتا می‌توانید کارساز خودتان را میزبانی کنید!",
@@ -737,8 +769,11 @@
   "server_banner.about_active_users": "افرادی که در ۳۰ روز گذشته از این کارساز استفاده کرده‌اند (کاربران فعّال ماهانه)",
   "server_banner.active_users": "کاربر فعّال",
   "server_banner.administered_by": "به مدیریت:",
+  "server_banner.is_one_of_many": "{domain} یکی از بسیاری از سرورهای مستقل ماستودون است که می توانید از آن برای شرکت در fediverse استفاده کنید.",
   "server_banner.server_stats": "آمار کارساز:",
   "sign_in_banner.create_account": "ایجاد حساب",
+  "sign_in_banner.follow_anyone": "هر کسی را در سراسر فدیورس دنبال کنید و همه را به ترتیب زمانی ببینید. هیچ الگوریتم، تبلیغات یا طعمه کلیکی در چشم نیست.",
+  "sign_in_banner.mastodon_is": "ماستودون بهترین راه برای پیگیری اتفاقات است.",
   "sign_in_banner.sign_in": "ورود",
   "sign_in_banner.sso_redirect": "ورود یا ثبت نام",
   "status.admin_account": "گشودن واسط مدیریت برای ‎@{name}",
@@ -757,6 +792,7 @@
   "status.edit": "ویرایش",
   "status.edited": "آخرین ویرایش {date}",
   "status.edited_x_times": "{count, plural, one {{count} مرتبه} other {{count} مرتبه}} ویرایش شد",
+  "status.embed": "گرفتن کد تعبیه",
   "status.favourite": "برگزیده‌",
   "status.favourites": "{count, plural, one {برگزیده} other {برگزیده}}",
   "status.filter": "پالایش این فرسته",
@@ -789,7 +825,7 @@
   "status.sensitive_warning": "محتوای حساس",
   "status.share": "هم‌رسانی",
   "status.show_less_all": "نمایش کمتر همه",
-  "status.show_more_all": "نمایش بیشتر همه",
+  "status.show_more_all": "نمایش بیش‌تر همه",
   "status.show_original": "نمایش اصلی",
   "status.title.with_attachments": "{user} {attachmentCount, plural, one {یک پیوست} other {{attachmentCount} پیوست}} فرستاد",
   "status.translate": "ترجمه",
@@ -819,6 +855,11 @@
   "upload_error.poll": "بارگذاری پرونده در نظرسنجی‌ها مجاز نیست.",
   "upload_form.audio_description": "برای ناشنوایان توصیفش کنید",
   "upload_form.description": "برای کم‌بینایان توصیفش کنید",
+  "upload_form.drag_and_drop.instructions": "برای دریافت پیوست رسانه، space را فشار دهید یا وارد کنید. در حین کشیدن، از کلیدهای جهت دار برای حرکت دادن پیوست رسانه در هر جهت معین استفاده کنید. برای رها کردن ضمیمه رسانه در موقعیت جدید خود، مجدداً 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": "برای کم‌بینایان یا ناشنوایان توصیفش کنید",
@@ -832,7 +873,7 @@
   "upload_modal.hint": "حتی اگر تصویر بریده یا کوچک شود، نقطهٔ کانونی آن همیشه دیده خواهد شد. نقطهٔ کانونی را با کلیک یا جابه‌جا کردن آن تنظیم کنید.",
   "upload_modal.preparing_ocr": "در حال آماده سازی OCR…",
   "upload_modal.preview_label": "پیش‌نمایش ({ratio})",
-  "upload_progress.label": "در حال بارگذاری…",
+  "upload_progress.label": "در حال بارگذاری...",
   "upload_progress.processing": "در حال پردازش…",
   "username.taken": "این نام کاربری گرفته شده. نام دیگری امتحان کنید",
   "video.close": "بستن ویدیو",

app/javascript/mastodon/locales/fi.json

@@ -12,7 +12,7 @@
   "about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
   "about.rules": "Palvelimen säännöt",
   "account.account_note_header": "Henkilökohtainen muistiinpano",
-  "account.add_or_remove_from_list": "Lisää tai poista listoilta",
+  "account.add_or_remove_from_list": "Lisää tai poista listoista",
   "account.badges.bot": "Botti",
   "account.badges.group": "Ryhmä",
   "account.block": "Estä @{name}",
@@ -35,10 +35,10 @@
   "account.followers": "Seuraajat",
   "account.followers.empty": "Kukaan ei seuraa tätä käyttäjää vielä.",
   "account.followers_counter": "{count, plural, one {{counter} seuraaja} other {{counter} seuraajaa}}",
-  "account.following": "Seuratut",
+  "account.following": "Seurattavat",
-  "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
+  "account.following_counter": "{count, plural, one {{counter} seurattava} other {{counter} seurattavaa}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
-  "account.go_to_profile": "Mene profiiliin",
+  "account.go_to_profile": "Siirry profiiliin",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
   "account.joined_short": "Liittynyt",
@@ -110,7 +110,7 @@
   "bundle_column_error.routing.body": "Pyydettyä sivua ei löytynyt. Oletko varma, että osoitepalkin URL-osoite on oikein?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sulje",
-  "bundle_modal_error.message": "Jotain meni pieleen komponenttia ladattaessa.",
+  "bundle_modal_error.message": "Jotain meni pieleen tätä komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudelleen",
   "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja olla silti vuorovaikutuksessa tämän kanssa.",
   "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta ota huomioon, ettei Mastodonin käyttö edellytä juuri kyseisen palvelimen tiliä.",
@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
   "content_warning.hide": "Piilota julkaisu",
   "content_warning.show": "Näytä kuitenkin",
+  "content_warning.show_more": "Näytä lisää",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -222,8 +223,8 @@
   "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
   "domain_block_modal.they_wont_know": "Hän ei saa tietää tulleensa estetyksi.",
   "domain_block_modal.title": "Estetäänkö verkkotunnus?",
-  "domain_block_modal.you_will_lose_num_followers": "Menetät {followersCount, plural, one {{followersCountDisplay} seuraajasi} other {{followersCountDisplay} seuraajaasi}} ja {followingCount, plural, one {{followingCountDisplay} seurattusi} other {{followingCountDisplay} seurattuasi}}.",
+  "domain_block_modal.you_will_lose_num_followers": "Menetät {followersCount, plural, one {{followersCountDisplay} seuraajasi} other {{followersCountDisplay} seuraajaasi}} ja {followingCount, plural, one {{followingCountDisplay} seurattavasi} other {{followingCountDisplay} seurattavaasi}}.",
-  "domain_block_modal.you_will_lose_relationships": "Menetät kaikki tämän palvelimen seuraajasi ja seurattusi.",
+  "domain_block_modal.you_will_lose_relationships": "Menetät kaikki tämän palvelimen seuraajasi ja seurattavasi.",
   "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
   "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
   "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
@@ -271,7 +272,7 @@
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
   "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
   "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia käyttäjiä, niin näet enemmän sisältöä.",
-  "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
+  "empty_column.list": "Tässä listassa ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {Yhdeltä käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
@@ -329,7 +330,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Samankaltainen kuin äskettäin seuraamasi profiilit",
   "follow_suggestions.view_all": "Näytä kaikki",
   "follow_suggestions.who_to_follow": "Ehdotuksia seurattavaksi",
-  "followed_tags": "Seuratut aihetunnisteet",
+  "followed_tags": "Seurattavat aihetunnisteet",
   "footer.about": "Tietoja",
   "footer.directory": "Profiilihakemisto",
   "footer.get_app": "Hanki sovellus",
@@ -356,10 +357,10 @@
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
   "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",
-  "hints.profiles.follows_may_be_missing": "Tämän profiilin seurattuja saattaa puuttua.",
+  "hints.profiles.follows_may_be_missing": "Tämän profiilin seurattavia saattaa puuttua.",
   "hints.profiles.posts_may_be_missing": "Tämän profiilin julkaisuja saattaa puuttua.",
   "hints.profiles.see_more_followers": "Näytä lisää seuraajia palvelimella {domain}",
-  "hints.profiles.see_more_follows": "Näytä lisää seurattuja palvelimella {domain}",
+  "hints.profiles.see_more_follows": "Näytä lisää seurattavia palvelimella {domain}",
   "hints.profiles.see_more_posts": "Näytä lisää julkaisuja palvelimella {domain}",
   "hints.threads.replies_may_be_missing": "Muiden palvelinten vastauksia saattaa puuttua.",
   "hints.threads.see_more": "Näytä lisää vastauksia palvelimella {domain}",
@@ -436,22 +437,22 @@
   "lightbox.close": "Sulje",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
-  "lightbox.zoom_in": "Zoomaa todelliseen kokoon",
+  "lightbox.zoom_in": "Näytä todellisen kokoisena",
-  "lightbox.zoom_out": "Zoomaa mahtumaan",
+  "lightbox.zoom_out": "Näytä sovitettuna",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Tehnyt {name}",
   "link_preview.more_from_author": "Lisää tekijältä {name}",
   "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
-  "lists.account.add": "Lisää listalle",
+  "lists.account.add": "Lisää listaan",
-  "lists.account.remove": "Poista listalta",
+  "lists.account.remove": "Poista listasta",
   "lists.delete": "Poista lista",
   "lists.edit": "Muokkaa listaa",
   "lists.edit.submit": "Vaihda nimi",
   "lists.exclusive": "Piilota nämä julkaisut kotisyötteestä",
   "lists.new.create": "Lisää lista",
   "lists.new.title_placeholder": "Uuden listan nimi",
-  "lists.replies_policy.followed": "Jokaiselle seuratulle käyttäjälle",
+  "lists.replies_policy.followed": "Jokaiselle seurattavalle käyttäjälle",
   "lists.replies_policy.list": "Listan jäsenille",
   "lists.replies_policy.none": "Ei kellekään",
   "lists.replies_policy.title": "Näytä vastaukset:",
@@ -484,8 +485,8 @@
   "navigation_bar.favourites": "Suosikit",
   "navigation_bar.filters": "Mykistetyt sanat",
   "navigation_bar.follow_requests": "Seurantapyynnöt",
-  "navigation_bar.followed_tags": "Seuratut aihetunnisteet",
+  "navigation_bar.followed_tags": "Seurattavat aihetunnisteet",
-  "navigation_bar.follows_and_followers": "Seuratut ja seuraajat",
+  "navigation_bar.follows_and_followers": "Seurattavat ja seuraajat",
   "navigation_bar.lists": "Listat",
   "navigation_bar.logout": "Kirjaudu ulos",
   "navigation_bar.moderation": "Moderointi",
@@ -508,7 +509,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 +517,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.",
@@ -531,9 +533,9 @@
   "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
-  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seurattavistasi} other {# seurattavistasi}}.",
   "notification.relationships_severance_event.learn_more": "Lue lisää",
-  "notification.relationships_severance_event.user_domain_block": "Olet estänyt verkkotunnuksen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
+  "notification.relationships_severance_event.user_domain_block": "Olet estänyt palvelimen {target}, mikä poisti {followersCount} seuraajistasi ja {followingCount, plural, one {# seurattavistasi} other {# seurattavistasi}}.",
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
@@ -566,8 +568,9 @@
   "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.poll": "Äänestystulokset:",
   "notifications.column_settings.push": "Puskuilmoitukset",
   "notifications.column_settings.reblog": "Tehostukset:",
   "notifications.column_settings.show": "Näytä sarakkeessa",
@@ -581,7 +584,7 @@
   "notifications.filter.favourites": "Suosikit",
   "notifications.filter.follows": "Seuraamiset",
   "notifications.filter.mentions": "Maininnat",
-  "notifications.filter.polls": "Äänestyksen tulokset",
+  "notifications.filter.polls": "Äänestystulokset",
   "notifications.filter.statuses": "Päivitykset seuraamiltasi käyttäjiltä",
   "notifications.grant_permission": "Myönnä käyttöoikeus.",
   "notifications.group": "{count} ilmoitusta",

app/javascript/mastodon/locales/fil.json

@@ -34,7 +34,9 @@
   "account.follow_back": "Sundan pabalik",
   "account.followers": "Mga tagasunod",
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
+  "account.followers_counter": "{count, plural, one {{counter} tagasunod} other {{counter} tagasunod}}",
   "account.following": "Sinusundan",
+  "account.following_counter": "{count, plural, one {{counter} sinusundan} other {{counter} sinusundan}}",
   "account.follows.empty": "Wala pang sinusundan ang tagagamit na ito.",
   "account.go_to_profile": "Pumunta sa profile",
   "account.hide_reblogs": "Itago ang mga pagpapalakas mula sa {name}",
@@ -46,17 +48,31 @@
   "account.media": "Medya",
   "account.mention": "Banggitin si @{name}",
   "account.moved_to": "Ipinahihiwatig ni {name} na ang kanilang bagong account ngayon ay:",
+  "account.mute": "I-mute si @{name}",
+  "account.mute_notifications_short": "I-mute ang mga abiso",
+  "account.mute_short": "I-mute",
+  "account.muted": "Naka-mute",
+  "account.mutual": "Ka-mutual",
+  "account.no_bio": "Walang nakalaan na paglalarawan.",
   "account.open_original_page": "Buksan ang pinagmulang pahina",
+  "account.posts": "Mga post",
   "account.report": "I-ulat si/ang @{name}",
+  "account.requested": "Naghihintay ng pag-apruba. I-click upang ikansela ang hiling sa pagsunod",
   "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",
+  "account.unfollow": "Huwag nang sundan",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "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 +123,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",
@@ -122,7 +140,9 @@
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
   "confirmations.edit.confirm": "Baguhin",
   "confirmations.reply.confirm": "Tumugon",
+  "content_warning.show_more": "Magpakita ng higit pa",
   "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",
@@ -139,7 +159,10 @@
   "dismissable_banner.explore_tags": "Ito ang mga sumisikat na mga hashtag sa iba't ibang bahagi ng social web ngayon. Ang mga hashtag ginagamit ng mas maraming mga iba't ibang tao ay tinataasan ng antas.",
   "dismissable_banner.public_timeline": "Ito ang mga pinakamakailang nakapublikong post mula sa mga taong nasa social web na sinusundan ng mga tao sa {domain}.",
   "domain_block_modal.block": "Harangan ang serbiro",
+  "domain_block_modal.they_wont_know": "Hindi nila malalaman na hinarang sila.",
   "domain_block_modal.title": "Harangan ang domain?",
+  "domain_block_modal.you_will_lose_relationships": "Mawawala ang lahat ng mga tagasunod at mga taong sinusindan mo mula sa serbirong ito.",
+  "domain_block_modal.you_wont_see_posts": "Hindi mo makikita ang mga post o mga abiso mula sa mga tagagamit sa serbirong ito.",
   "domain_pill.server": "Serbiro",
   "embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
   "embed.preview": "Ito ang magiging itsura:",
@@ -176,17 +199,21 @@
   "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.",
+  "empty_column.notification_requests": "Malinis na lahat! Walang anuman dito. Kapag nakatanggap ka ng mga bagong abiso, makikita sila dito na batay sa iyong mga setting.",
+  "errors.unexpected_crash.report_issue": "Iulat ang isyu",
   "explore.search_results": "Mga resulta ng paghahanap",
   "explore.suggested_follows": "Mga tao",
   "explore.title": "Tuklasin",
   "explore.trending_links": "Mga balita",
   "filter_modal.select_filter.search": "Hanapin o gumawa",
+  "filter_warning.matches_filter": "Tinutugma ang pangsala \"<span>{title}</span>\"",
   "firehose.all": "Lahat",
   "firehose.local": "Itong serbiro",
   "firehose.remote": "Ibang mga serbiro",
   "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 +223,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 +251,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",
@@ -241,24 +272,37 @@
   "navigation_bar.public_timeline": "Pinagsamang timeline",
   "navigation_bar.search": "Maghanap",
   "notification.admin.report": "Iniulat ni {name} si {target}",
+  "notification.admin.report_statuses_other": "Iniulat ni {name} si {target}",
   "notification.follow": "Sinundan ka ni {name}",
+  "notification.follow.name_and_others": "Sinundan ka ng/nina {name} at <a>{count,  plural, one {# iba pa} other {# na iba pa}}</a>",
   "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.maximize": "Palakihin",
   "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:",
   "notifications.column_settings.follow": "Mga bagong tagasunod:",
+  "notifications.column_settings.group": "Pangkat",
   "notifications.column_settings.poll": "Resulta ng botohan:",
   "notifications.column_settings.unread_notifications.category": "Hindi Nabasang mga Abiso",
   "notifications.column_settings.update": "Mga pagbago:",
   "notifications.filter.all": "Lahat",
+  "notifications.filter.boosts": "Mga pagpalakas",
   "notifications.filter.favourites": "Mga paborito",
+  "notifications.filter.follows": "Mga sinusundan",
+  "notifications.filter.mentions": "Mga pagbanggit",
   "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 +319,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 +334,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 +342,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?",
@@ -305,8 +356,12 @@
   "report.thanks.title": "Ayaw mo bang makita ito?",
   "report.thanks.title_actionable": "Salamat sa pag-uulat, titingnan namin ito.",
   "report_notification.categories.other": "Iba pa",
+  "report_notification.categories.other_sentence": "iba pa",
   "report_notification.categories.violation": "Paglabag sa patakaran",
+  "report_notification.categories.violation_sentence": "paglabag sa patakaran",
   "report_notification.open": "Buksan ang ulat",
+  "search.placeholder": "Maghanap",
+  "search.quick_action.go_to_account": "Pumunta sa profile {x}",
   "search.quick_action.open_url": "Buksan ang URL sa Mastodon",
   "search.search_or_paste": "Maghanap o ilagay ang URL",
   "search_popout.full_text_search_disabled_message": "Hindi magagamit sa {domain}.",
@@ -342,5 +397,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

@@ -197,6 +197,7 @@
   "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
   "content_warning.hide": "Fjal post",
   "content_warning.show": "Vís kortini",
+  "content_warning.show_more": "Vís meiri",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
-  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
   "firehose.all": "Allar",
@@ -508,7 +509,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 +517,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 +568,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

@@ -1,6 +1,6 @@
 {
   "about.blocks": "Serveurs modérés",
-  "about.contact": "Contact:",
+  "about.contact": "Contact :",
   "about.disclaimer": "Mastodon est un logiciel open-source gratuit et une marque déposée de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison non disponible",
   "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec des comptes de n'importe quel serveur dans le fediverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
@@ -31,7 +31,7 @@
   "account.featured_tags.last_status_never": "Aucune publication",
   "account.featured_tags.title": "Hashtags inclus de {name}",
   "account.follow": "Suivre",
-  "account.follow_back": "S'abonner en retour",
+  "account.follow_back": "Suivre en retour",
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
@@ -85,18 +85,18 @@
   "alert.rate_limited.title": "Débit limité",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups!",
-  "alt_text_badge.title": "Texte Alt",
+  "alt_text_badge.title": "Texte alternatif",
   "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.",
-  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur·rice ?",
+  "block_modal.title": "Bloquer le compte ?",
-  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
   "boost_modal.undo_reblog": "Annuler le boost du message ?",
@@ -173,7 +173,7 @@
   "confirmations.block.confirm": "Bloquer",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Voulez-vous vraiment supprimer cette publication?",
-  "confirmations.delete.title": "Supprimer la publication ?",
+  "confirmations.delete.title": "Supprimer le message ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.delete_list.title": "Supprimer la liste ?",
@@ -194,9 +194,10 @@
   "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",
+  "content_warning.show": "Montrer quand même",
+  "content_warning.show_more": "Montrer plus",
   "conversation.delete": "Supprimer cette conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher cette conversation",
@@ -218,13 +219,13 @@
   "dismissable_banner.public_timeline": "Ce sont les messages publics les plus récents de personnes sur le web social que les gens de {domain} suivent.",
   "domain_block_modal.block": "Bloquer le serveur",
   "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
-  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciens messages.",
   "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
   "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
   "domain_block_modal.title": "Bloquer le domaine ?",
   "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
   "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
-  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les messages 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",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
-  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
+  "filter_warning.matches_filter": "Correspond au filtre « <span>{title}</span> »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -508,7 +509,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 +517,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 +544,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 +568,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 +855,11 @@
   "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.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
+  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
+  "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
   "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

@@ -3,7 +3,7 @@
   "about.contact": "Contact :",
   "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison non disponible",
-  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rice⋅s de n'importe quel autre serveur dans le fédiverse. Voici les exceptions qui ont été faites sur ce serveur en particulier.",
+  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rices de n'importe quel autre serveur dans le fédivers. Voici les exceptions qui ont été faites sur ce serveur-là.",
   "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
   "about.domain_blocks.silenced.title": "Limité",
   "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les comptes de ce serveur.",
@@ -19,7 +19,7 @@
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
   "account.blocked": "Bloqué·e",
-  "account.cancel_follow_request": "Annuler le suivi",
+  "account.cancel_follow_request": "Annuler l'abonnement",
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
@@ -31,18 +31,18 @@
   "account.featured_tags.last_status_never": "Aucun message",
   "account.featured_tags.title": "Les hashtags en vedette de {name}",
   "account.follow": "Suivre",
-  "account.follow_back": "S'abonner en retour",
+  "account.follow_back": "Suivre en retour",
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
   "account.following": "Abonnements",
   "account.following_counter": "{count, plural, one {{counter} abonnement} other {{counter} abonnements}}",
   "account.follows.empty": "Cet·te utilisateur·rice ne suit personne pour l’instant.",
-  "account.go_to_profile": "Aller au profil",
+  "account.go_to_profile": "Voir le profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.in_memoriam": "En mémoire de.",
   "account.joined_short": "Ici depuis",
-  "account.languages": "Changer les langues abonnées",
+  "account.languages": "Modifier les langues d'abonnements",
   "account.link_verified_on": "La propriété de ce lien a été vérifiée le {date}",
   "account.locked_info": "Ce compte est privé. Son ou sa propriétaire approuve manuellement qui peut le suivre.",
   "account.media": "Médias",
@@ -79,24 +79,24 @@
   "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é",
   "alert.unexpected.message": "Une erreur inattendue s’est produite.",
   "alert.unexpected.title": "Oups !",
-  "alt_text_badge.title": "Texte Alt",
+  "alt_text_badge.title": "Texte alternatif",
   "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.",
-  "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
+  "block_modal.they_cant_see_posts": "Il ne peut plus voir vos messages et vous ne verrez plus les siens.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur·rice ?",
+  "block_modal.title": "Bloquer le compte ?",
-  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "boost_modal.reblog": "Booster le message ?",
   "boost_modal.undo_reblog": "Annuler le boost du message ?",
@@ -163,7 +163,7 @@
   "compose_form.poll.switch_to_single": "Modifier le sondage pour autoriser qu'un seul choix",
   "compose_form.poll.type": "Style",
   "compose_form.publish": "Publier",
-  "compose_form.publish_form": "Nouvelle publication",
+  "compose_form.publish_form": "Nouveau message",
   "compose_form.reply": "Répondre",
   "compose_form.save_changes": "Mettre à jour",
   "compose_form.spoiler.marked": "Enlever l’avertissement de contenu",
@@ -173,7 +173,7 @@
   "confirmations.block.confirm": "Bloquer",
   "confirmations.delete.confirm": "Supprimer",
   "confirmations.delete.message": "Voulez-vous vraiment supprimer ce message ?",
-  "confirmations.delete.title": "Supprimer la publication ?",
+  "confirmations.delete.title": "Supprimer le message ?",
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.delete_list.title": "Supprimer la liste ?",
@@ -187,16 +187,17 @@
   "confirmations.logout.title": "Se déconnecter ?",
   "confirmations.mute.confirm": "Masquer",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
-  "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire ? Ses partages ainsi que ses mises en favori seront perdus et ses réponses seront orphelines.",
+  "confirmations.redraft.message": "Voulez-vous vraiment supprimer le message pour le réécrire ? Ses partages ainsi que ses mises en favori seront perdues, et ses réponses seront orphelines.",
   "confirmations.redraft.title": "Supprimer et réécrire le message ?",
   "confirmations.reply.confirm": "Répondre",
   "confirmations.reply.message": "Répondre maintenant écrasera votre message en cours de rédaction. Voulez-vous vraiment continuer ?",
   "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",
+  "content_warning.show": "Montrer quand même",
+  "content_warning.show_more": "Montrer plus",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
@@ -218,13 +219,13 @@
   "dismissable_banner.public_timeline": "Il s'agit des messages publics les plus récents publiés par des gens sur le web social et que les utilisateurs de {domain} suivent.",
   "domain_block_modal.block": "Bloquer le serveur",
   "domain_block_modal.block_account_instead": "Bloquer @{name} à la place",
-  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciennes publications.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Les personnes de ce serveur peuvent interagir avec vos anciens messages.",
   "domain_block_modal.they_cant_follow": "Personne de ce serveur ne peut vous suivre.",
   "domain_block_modal.they_wont_know": "Il ne saura pas qu'il a été bloqué.",
   "domain_block_modal.title": "Bloquer le domaine ?",
   "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
   "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
-  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les publications ou les notifications des utilisateurs de ce serveur.",
+  "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les messages 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 +263,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.",
@@ -305,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou créez-en une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
-  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
+  "filter_warning.matches_filter": "Correspond au filtre « <span>{title}</span> »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -503,12 +504,12 @@
   "notification.admin.report_account_other": "{name} a signalé {count, plural, one {un message} other {# messages}} depuis {target}",
   "notification.admin.report_statuses": "{name} a signalé {target} pour {category}",
   "notification.admin.report_statuses_other": "{name} a signalé {target}",
-  "notification.admin.sign_up": "{name} s'est inscrit",
+  "notification.admin.sign_up": "{name} s'est inscrit·e",
   "notification.admin.sign_up.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} se sont inscrit",
   "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 +517,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 +544,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 +568,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",
@@ -729,7 +732,7 @@
   "report.thanks.title": "Vous ne voulez pas voir cela ?",
   "report.thanks.title_actionable": "Merci pour votre signalement, nous allons investiguer.",
   "report.unfollow": "Ne plus suivre @{name}",
-  "report.unfollow_explanation": "Vous êtes abonné à ce compte. Pour ne plus voir ses publications dans votre fil principal, retirez-le de votre liste d'abonnements.",
+  "report.unfollow_explanation": "Vous êtes abonné à ce compte. Pour ne plus voir ses messages dans votre fil principal, retirez-le de votre liste d'abonnements.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.legal": "Légal",
   "report_notification.categories.legal_sentence": "contenu illégal",
@@ -746,7 +749,7 @@
   "search.quick_action.go_to_account": "Aller au profil {x}",
   "search.quick_action.go_to_hashtag": "Aller au hashtag {x}",
   "search.quick_action.open_url": "Ouvrir l'URL dans Mastodon",
-  "search.quick_action.status_search": "Publications correspondant à {x}",
+  "search.quick_action.status_search": "Messages correspondant à {x}",
   "search.search_or_paste": "Rechercher ou saisir une URL",
   "search_popout.full_text_search_disabled_message": "Non disponible sur {domain}.",
   "search_popout.full_text_search_logged_out_message": "Disponible uniquement lorsque vous êtes connecté.",
@@ -852,6 +855,11 @@
   "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.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
+  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
+  "upload_form.drag_and_drop.on_drag_start": "A récupéré la pièce jointe {item}.",
   "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",
@@ -196,6 +197,7 @@
   "confirmations.unfollow.title": "Brûker net mear folgje?",
   "content_warning.hide": "Berjocht ferstopje",
   "content_warning.show": "Dochs toane",
+  "content_warning.show_more": "Mear toane",
   "conversation.delete": "Petear fuortsmite",
   "conversation.mark_as_read": "As lêzen markearje",
   "conversation.open": "Petear toane",
@@ -221,6 +223,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.",
@@ -302,7 +306,7 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
-  "filter_warning.matches_filter": "Komt oerien mei filter ‘{title}’",
+  "filter_warning.matches_filter": "Komt oerien mei filter ‘<span>{title}</span>’",
   "filtered_notifications_banner.pending_requests": "Fan {count, plural, =0 {net ien} one {ien persoan} other {# persoanen}} dy’t jo mooglik kinne",
   "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
@@ -433,6 +437,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 +460,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 +509,7 @@
   "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.name_and_others": "{name} en <a>{count, plural, one {# oar persoan} other {# oare persoanen}}</a> folgje jo no",
   "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 +517,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.",
@@ -560,6 +568,7 @@
   "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
+  "notifications.column_settings.group": "Groepearje",
   "notifications.column_settings.mention": "Fermeldingen:",
   "notifications.column_settings.poll": "Enkêteresultaten:",
   "notifications.column_settings.push": "Pushmeldingen",
@@ -774,6 +783,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 +792,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 +817,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 +855,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",