Merge pull request #2871 from ClearlyClaire/glitch-soc/backports-4.3

Merge upstream changes (stable-4.3)
2024-11-25 16:41:36 +01:00 · 2024-10-07 21:25:03 +02:00 · 2024-10-07 21:25:03 +02:00 · 959841ae95
commit 959841ae95
parent 026643ab24 f669493d96
85 changed files with 662 additions and 134 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,7 +2,7 @@

 All notable changes to this project will be documented in this file.

-## [4.3.0] - UNRELEASED
+## [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 +11,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 +28,7 @@ The following changelog entries focus on changes visible to users, administrator
  - `GET /api/v2/notifications/:group_key/accounts`: https://docs.joinmastodon.org/methods/grouped_notifications/#get-group-accounts
  - `POST /api/v2/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/grouped_notifications/#dismiss-group
  - `GET /api/v2/notifications/:unread_count`: https://docs.joinmastodon.org/methods/grouped_notifications/#unread-group-count
- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, #31723 and #32062 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
+- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, #31541, #31723, #32062 and #32281 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
  The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\
  You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
  Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
@ -61,7 +61,7 @@ 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
@ -150,10 +150,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 +170,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 +194,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 +286,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 +312,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 +327,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)
--- a/SECURITY.md
+++ b/SECURITY.md
@ -13,8 +13,9 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through

 ## Supported Versions

-| Version | Supported |
-| ------- | --------- |
-| 4.2.x   | Yes       |
-| 4.1.x   | Yes       |
-| < 4.1   | No        |
+| Version | Supported        |
+| ------- | ---------------- |
+| 4.3.x   | Yes              |
+| 4.2.x   | Yes              |
+| 4.1.x   | Until 2025-04-08 |
+| < 4.1   | No               |
--- a/app/javascript/flavours/glitch/components/avatar.tsx
+++ b/app/javascript/flavours/glitch/components/avatar.tsx
@ -1,10 +1,11 @@
+import { useState, useCallback } from 'react';
+
 import classNames from 'classnames';

+import { useHovering } from 'flavours/glitch/hooks/useHovering';
+import { autoPlayGif } from 'flavours/glitch/initial_state';
 import type { Account } from 'flavours/glitch/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,17 +40,29 @@ 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}
      data-avatar-of={account && `@${account.get('acct')}`}
    >
-      {src && <img src={src} alt='' />}
+      {src && !error && (
+        <img src={src} alt='' onLoad={handleLoad} onError={handleError} />
+      )}
+
      {counter && (
        <div
          className='account__avatar__counter'
--- a/app/javascript/flavours/glitch/components/media_gallery.jsx
+++ b/app/javascript/flavours/glitch/components/media_gallery.jsx
@ -356,14 +356,14 @@ class MediaGallery extends PureComponent {

    return (
      <div className={computedClass} 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>
--- a/app/javascript/flavours/glitch/styles/components.scss
+++ b/app/javascript/flavours/glitch/styles/components.scss
@ -2259,7 +2259,6 @@ body > [data-popper-placement] {
  display: block;
  position: relative;
  border-radius: var(--avatar-border-radius);
-  background-color: var(--surface-background-color);

  img {
    width: 100%;
@ -2269,7 +2268,11 @@ body > [data-popper-placement] {
    display: inline-block; // to not show broken images
  }

-  &-inline {
+  &--loading {
+    background-color: var(--surface-background-color);
+  }
+
+  &--inline {
    display: inline-block;
    vertical-align: middle;
    margin-inline-end: 5px;
@ -11172,6 +11175,7 @@ noscript {
  gap: 8px;

  .logo {
+    width: 16px;
    height: 16px;
    color: $darker-text-color;
  }
--- a/app/javascript/mastodon/components/tests/snapshots/avatar-test.jsx.snap
+++ b/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>
--- a/app/javascript/mastodon/components/avatar.tsx
+++ b/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'
--- a/app/javascript/mastodon/components/media_gallery.jsx
+++ b/app/javascript/mastodon/components/media_gallery.jsx
@ -336,14 +336,14 @@ class MediaGallery extends PureComponent {

    return (
      <div className={`media-gallery media-gallery--layout-${size}`} 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>
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -84,6 +84,7 @@
  "alert.rate_limited.title": "معدل الطلبات محدود",
  "alert.unexpected.message": "لقد طرأ خطأ غير متوقّع.",
  "alert.unexpected.title": "المعذرة!",
+  "alt_text_badge.title": "نص بديل",
  "announcement.announcement": "إعلان",
  "attachments_list.unprocessed": "(غير معالَج)",
  "audio.hide": "إخفاء المقطع الصوتي",
@ -758,7 +759,7 @@
  "status.history.edited": "عدله {name} {date}",
  "status.load_more": "حمّل المزيد",
  "status.media.open": "اضغط للفتح",
-  "status.media.show": "اضغط لإظهاره",
+  "status.media.show": "اضغط لإظهارها",
  "status.media_hidden": "وسائط مخفية",
  "status.mention": "أذكُر @{name}",
  "status.more": "المزيد",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -516,6 +516,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.",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Cyfradd gyfyngedig",
  "alert.unexpected.message": "Digwyddodd gwall annisgwyl.",
  "alert.unexpected.title": "Wps!",
+  "alt_text_badge.title": "Testun Amgen",
  "announcement.announcement": "Cyhoeddiad",
  "attachments_list.unprocessed": "(heb eu prosesu)",
  "audio.hide": "Cuddio sain",
@ -221,6 +222,7 @@
  "domain_block_modal.they_cant_follow": "Ni all neb o'r gweinydd hwn eich dilyn.",
  "domain_block_modal.they_wont_know": "Fyddan nhw ddim yn gwybod eu bod wedi cael eu blocio.",
  "domain_block_modal.title": "Blocio parth?",
+  "domain_block_modal.you_will_lose_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.",
@ -849,6 +851,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",
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Privat svar",
  "notification.label.reply": "Besvar",
  "notification.mention": "Omtale",
+  "notification.mentioned_you": "{name} nævnte dig",
  "notification.moderation-warning.learn_more": "Læs mere",
  "notification.moderation_warning": "Du er tildelt en moderationsadvarsel",
  "notification.moderation_warning.action_delete_statuses": "Nogle af dine indlæg er blevet fjernet.",
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@ -41,7 +41,7 @@
  "account.go_to_profile": "Profil aufrufen",
  "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
  "account.in_memoriam": "Zum Andenken.",
-  "account.joined_short": "Beigetreten",
+  "account.joined_short": "Mitglied seit",
  "account.languages": "Ausgewählte Sprachen ändern",
  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
  "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
@ -62,7 +62,7 @@
  "account.requested_follow": "{name} möchte dir folgen",
  "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.statuses_counter": "{count, plural, one {{counter} post} other {{counter} posts}}",
  "account.unblock": "Blockierung von @{name} aufheben",
  "account.unblock_domain": "Blockierung von {domain} aufheben",
  "account.unblock_short": "Blockierung aufheben",
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Private Antwort",
  "notification.label.reply": "Antwort",
  "notification.mention": "Erwähnung",
+  "notification.mentioned_you": "{name} erwähnte dich",
  "notification.moderation-warning.learn_more": "Mehr erfahren",
  "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
  "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
@ -534,7 +535,7 @@
  "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
  "notification.relationships_severance_event.learn_more": "Mehr erfahren",
  "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
-  "notification.status": "{name} hat gerade etwas gepostet",
+  "notification.status": "{name} veröffentlichte gerade",
  "notification.update": "{name} bearbeitete einen Beitrag",
  "notification_requests.accept": "Genehmigen",
  "notification_requests.accept_multiple": "{count, plural, one {# Anfrage genehmigen …} other {# Anfragen genehmigen …}}",
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Περιορισμός συχνότητας",
  "alert.unexpected.message": "Προέκυψε απροσδόκητο σφάλμα.",
  "alert.unexpected.title": "Ουπς!",
+  "alt_text_badge.title": "Εναλλακτικό κείμενο",
  "announcement.announcement": "Ανακοίνωση",
  "attachments_list.unprocessed": "(μη επεξεργασμένο)",
  "audio.hide": "Απόκρυψη αρχείου ήχου",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Κανείς από αυτόν τον διακομιστή δεν μπορεί να σε ακολουθήσει.",
  "domain_block_modal.they_wont_know": "Δεν θα ξέρουν ότι έχουν αποκλειστεί.",
  "domain_block_modal.title": "Αποκλεισμός τομέα;",
+  "domain_block_modal.you_will_lose_num_followers": "Θα χάσετε {followersCount, plural, one {{followersCountDisplay} ακόλουθο} other {{followersCountDisplay} ακόλουθους}} και {followingCount, plural, one {{followingCountDisplay} άτομο που ακολουθείτε} other {{followingCountDisplay} άτομα που ακολουθείτε}}.",
+  "domain_block_modal.you_will_lose_relationships": "Θα χάσετε όλους τους ακόλουθους και τα άτομα που ακολουθείτε από αυτόν τον διακομιστή.",
  "domain_block_modal.you_wont_see_posts": "Δεν θα βλέπεις αναρτήσεις ή ειδοποιήσεις από χρήστες σε αυτόν το διακομιστή.",
  "domain_pill.activitypub_lets_connect": "Σού επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
  "domain_pill.activitypub_like_language": "Το ActivityPub είναι σαν τη γλώσσα Mastodon μιλάει με άλλα κοινωνικά δίκτυα.",
@ -849,6 +852,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": "Περιγραφή για άτομα με προβλήματα ακοής ή όρασης",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@ -852,6 +852,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",
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@ -516,6 +516,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.",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -22,10 +22,10 @@
  "account.cancel_follow_request": "Nuligi peton por sekvado",
  "account.copy": "Kopii ligilon al profilo",
  "account.direct": "Private mencii @{name}",
-  "account.disable_notifications": "Ne plu sciigi min, kiam @{name} mesaĝas",
+  "account.disable_notifications": "Ĉesu sciigi min kiam @{name} afiŝas",
  "account.domain_blocked": "Domajno blokita",
  "account.edit_profile": "Redakti la profilon",
-  "account.enable_notifications": "Sciigi min, kiam @{name} mesaĝas",
+  "account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
  "account.endorse": "Rekomendi ĉe via profilo",
  "account.featured_tags.last_status_at": "Lasta afîŝo je {date}",
  "account.featured_tags.last_status_never": "Neniu afiŝo",
@ -49,14 +49,14 @@
  "account.mention": "Mencii @{name}",
  "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
  "account.mute": "Silentigi @{name}",
-  "account.mute_notifications_short": "Silentigu Sciigojn",
+  "account.mute_notifications_short": "Silentigu sciigojn",
  "account.mute_short": "Silentigu",
  "account.muted": "Silentigita",
  "account.mutual": "Reciproka",
  "account.no_bio": "Neniu priskribo estas provizita.",
  "account.open_original_page": "Malfermi la originalan paĝon",
  "account.posts": "Afiŝoj",
-  "account.posts_with_replies": "Mesaĝoj kaj respondoj",
+  "account.posts_with_replies": "Afiŝoj kaj respondoj",
  "account.report": "Raporti @{name}",
  "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
  "account.requested_follow": "{name} petis sekvi vin",
@ -69,7 +69,7 @@
  "account.unendorse": "Ne plu rekomendi ĉe la profilo",
  "account.unfollow": "Ĉesi sekvi",
  "account.unmute": "Ne plu silentigi @{name}",
-  "account.unmute_notifications_short": "Malsilentigu Sciigojn",
+  "account.unmute_notifications_short": "Malsilentigu sciigojn",
  "account.unmute_short": "Ne plu silentigi",
  "account_note.placeholder": "Alklaku por aldoni noton",
  "admin.dashboard.daily_retention": "Uzantoretenprocento lau tag post registro",
@ -81,7 +81,7 @@
  "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!",
@ -163,7 +163,7 @@
  "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
  "compose_form.poll.type": "Stilo",
  "compose_form.publish": "Afiŝo",
-  "compose_form.publish_form": "Afiŝi",
+  "compose_form.publish_form": "Nova afiŝo",
  "compose_form.reply": "Respondi",
  "compose_form.save_changes": "Ĝisdatigi",
  "compose_form.spoiler.marked": "Forigi la averton de enhavo",
@ -173,7 +173,7 @@
  "confirmations.block.confirm": "Bloki",
  "confirmations.delete.confirm": "Forigi",
  "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun afiŝon?",
-  "confirmations.delete.title": "Ĉu forigi Afiŝon?",
+  "confirmations.delete.title": "Ĉu forigi afiŝon?",
  "confirmations.delete_list.confirm": "Forigi",
  "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
  "confirmations.delete_list.title": "Ĉu forigi liston?",
@ -213,9 +213,9 @@
  "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
  "dismissable_banner.dismiss": "Eksigi",
  "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.",
-  "dismissable_banner.explore_statuses": "Ĉi tioj estas afiŝoj de socia reto kiu populariĝas hodiau.",
+  "dismissable_banner.explore_statuses": "Ĉi tiuj estas afiŝoj de la tuta socia reto, kiuj populariĝas hodiaŭ. Pli novaj afiŝoj kun pli da diskonigoj kaj plej ŝatataj estas rangigitaj pli alte.",
  "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
-  "dismissable_banner.public_timeline": "Ĉi tioj estas plej lastaj publikaj afiŝoj de personoj ĉe socia reto kiu personoj ĉe {domain} sekvas.",
+  "dismissable_banner.public_timeline": "Ĉi tiuj estas la plej lastatempaj publikaj afiŝoj de homoj en la socia reto, kiujn homoj sur {domain} sekvas.",
  "domain_block_modal.block": "Bloki servilon",
  "domain_block_modal.block_account_instead": "Bloki @{name} anstataŭe",
  "domain_block_modal.they_can_interact_with_old_posts": "Homoj de ĉi tiu servilo povas interagi kun viaj malnovaj afiŝoj.",
@ -265,8 +265,8 @@
  "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.favourites": "Ankoraŭ neniu stelumis tiun 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": "Neniu ankoraŭ ŝatis ĉi tiun afiŝon. Kiam iu ŝatos ĝin, ili aperos ĉi tie.",
  "empty_column.follow_requests": "Vi ne ankoraŭ havas iun peton de sekvado. Kiam vi ricevos unu, ĝi aperos ĉi tie.",
  "empty_column.followed_tags": "Vi ankoraŭ ne sekvas iujn kradvortojn. Kiam vi faras, ili aperos ĉi tie.",
  "empty_column.hashtag": "Ankoraŭ estas nenio per ĉi tiu kradvorto.",
@ -296,7 +296,7 @@
  "filter_modal.added.review_and_configure": "Por kontroli kaj pli modifi ĉi tiu filtrilkategorio, iru al la {settings_link}.",
  "filter_modal.added.review_and_configure_title": "Filtrilopcioj",
  "filter_modal.added.settings_link": "opciopaĝo",
-  "filter_modal.added.short_explanation": "Ĉi tiu mesaĝo aldonitas al la filtrilkategorio: {title}.",
+  "filter_modal.added.short_explanation": "Ĉi tiu afiŝo aldonitas al la filtrilkategorio: {title}.",
  "filter_modal.added.title": "Filtrilo aldonita!",
  "filter_modal.select_filter.context_mismatch": "ne kongruas la kuntekston",
  "filter_modal.select_filter.expired": "eksvalidiĝinta",
@ -304,7 +304,7 @@
  "filter_modal.select_filter.search": "Serĉi aŭ krei",
  "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
  "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
-  "filter_modal.title.status": "Filtri mesaĝon",
+  "filter_modal.title.status": "Filtri afiŝon",
  "filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
  "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
  "filtered_notifications_banner.title": "Filtritaj sciigoj",
@ -351,7 +351,7 @@
  "hashtag.column_settings.tag_toggle": "Aldoni pliajn etikedojn por ĉi tiu kolumno",
  "hashtag.counter_by_accounts": "{count, plural,one {{counter} partoprenanto} other {{counter} partoprenantoj}}",
  "hashtag.counter_by_uses": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}}",
-  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiau",
+  "hashtag.counter_by_uses_today": "{count, plural,one {{counter} afiŝo} other {{counter} afiŝoj}} hodiaŭ",
  "hashtag.follow": "Sekvi la kradvorton",
  "hashtag.unfollow": "Ne plu sekvi la kradvorton",
  "hashtags.and_other": "…kaj {count, plural,other {# pli}}",
@ -382,9 +382,9 @@
  "ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
  "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
  "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumiti ĉi tiun afiŝon por sciigi la afiŝanton ke vi aprezigas ŝin kaj konservas por la estonteco.",
-  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povos sekvi {name} por vidi ties mesaĝojn en via hejmo.",
+  "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
  "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
-  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu mesaĝo.",
+  "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
  "interaction_modal.login.action": "Prenu min hejmen",
  "interaction_modal.login.prompt": "Domajno de via hejma servilo, ekz. mastodon.social",
  "interaction_modal.no_account_yet": "Ĉu ne estas ĉe Mastodon?",
@ -402,12 +402,12 @@
  "keyboard_shortcuts.back": "reveni",
  "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.description": "Priskribo",
  "keyboard_shortcuts.direct": "por malfermi la kolumnon pri privataj mencioj",
  "keyboard_shortcuts.down": "iri suben 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",
@ -421,16 +421,16 @@
  "keyboard_shortcuts.my_profile": "malfermi vian profilon",
  "keyboard_shortcuts.notifications": "malfermi la kolumnon de sciigoj",
  "keyboard_shortcuts.open_media": "Malfermi plurmedion",
-  "keyboard_shortcuts.pinned": "malfermi la liston de alpinglitaj mesaĝoj",
+  "keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
  "keyboard_shortcuts.profile": "malfermi la profilon de la aŭtoro",
-  "keyboard_shortcuts.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.spoilers": "Montri/kaŝi la kampon de averto de enhavo (\"CW\")",
  "keyboard_shortcuts.start": "malfermi la kolumnon «por komenci»",
  "keyboard_shortcuts.toggle_hidden": "Montri/kaŝi tekston malantaŭ la averto de enhavo (\"CW\")",
  "keyboard_shortcuts.toggle_sensitivity": "Montri/kaŝi plurmedion",
-  "keyboard_shortcuts.toot": "Krei novan mesaĝon",
+  "keyboard_shortcuts.toot": "Komencu novan afiŝon",
  "keyboard_shortcuts.unfocus": "malenfokusigi la tekstujon aŭ la serĉilon",
  "keyboard_shortcuts.up": "iri supren en la listo",
  "lightbox.close": "Fermi",
@ -476,9 +476,9 @@
  "navigation_bar.blocks": "Blokitaj uzantoj",
  "navigation_bar.bookmarks": "Legosignoj",
  "navigation_bar.community_timeline": "Loka templinio",
-  "navigation_bar.compose": "Skribi novan mesaĝon",
+  "navigation_bar.compose": "Redakti novan afiŝon",
  "navigation_bar.direct": "Privataj mencioj",
-  "navigation_bar.discover": "Esplori",
+  "navigation_bar.discover": "Malkovri",
  "navigation_bar.domain_blocks": "Blokitaj domajnoj",
  "navigation_bar.explore": "Esplori",
  "navigation_bar.favourites": "Stelumoj",
@ -487,12 +487,12 @@
  "navigation_bar.followed_tags": "Sekvataj kradvortoj",
  "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
  "navigation_bar.lists": "Listoj",
-  "navigation_bar.logout": "Adiaŭi",
+  "navigation_bar.logout": "Elsaluti",
  "navigation_bar.moderation": "Modereco",
  "navigation_bar.mutes": "Silentigitaj uzantoj",
  "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
  "navigation_bar.personal": "Persone",
-  "navigation_bar.pins": "Alpinglitaj mesaĝoj",
+  "navigation_bar.pins": "Alpinglitaj afiŝoj",
  "navigation_bar.preferences": "Preferoj",
  "navigation_bar.public_timeline": "Fratara templinio",
  "navigation_bar.search": "Serĉi",
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Privata respondo",
  "notification.label.reply": "Respondi",
  "notification.mention": "Mencii",
+  "notification.mentioned_you": "{name} menciis vin",
  "notification.moderation-warning.learn_more": "Lerni pli",
  "notification.moderation_warning": "Vi ricevis moderigan averton",
  "notification.moderation_warning.action_delete_statuses": "Kelkaj el viaj afiŝoj estis forigitaj.",
@ -572,7 +573,7 @@
  "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:",
@ -660,7 +661,7 @@
  "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
  "poll_button.add_poll": "Aldoni balotenketon",
  "poll_button.remove_poll": "Forigi balotenketon",
-  "privacy.change": "Agordi mesaĝan privatecon",
+  "privacy.change": "Ŝanĝu afiŝan privatecon",
  "privacy.direct.long": "Ĉiuj menciitaj en la afiŝo",
  "privacy.direct.short": "Specifaj homoj",
  "privacy.private.long": "Nur viaj sekvantoj",
@ -775,13 +776,13 @@
  "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
  "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
  "status.admin_domain": "Malfermu moderigan interfacon por {domain}",
-  "status.admin_status": "Malfermi ĉi tiun mesaĝon en la kontrola interfaco",
+  "status.admin_status": "Malfermi ĉi tiun afiŝon en la kontrola interfaco",
  "status.block": "Bloki @{name}",
  "status.bookmark": "Aldoni al la legosignoj",
  "status.cancel_reblog_private": "Ne plu diskonigi",
  "status.cannot_reblog": "Ĉi tiun afiŝon ne eblas diskonigi",
  "status.continued_thread": "Daŭrigis fadenon",
-  "status.copy": "Kopii la ligilon al la mesaĝo",
+  "status.copy": "Kopii la ligilon al la afiŝo",
  "status.delete": "Forigi",
  "status.detailed_status": "Detala konversacia vido",
  "status.direct": "Private mencii @{name}",
@ -803,9 +804,9 @@
  "status.more": "Pli",
  "status.mute": "Silentigi @{name}",
  "status.mute_conversation": "Silentigi konversacion",
-  "status.open": "Disvolvi la mesaĝon",
+  "status.open": "Pligrandigu ĉi tiun afiŝon",
  "status.pin": "Alpingli al la profilo",
-  "status.pinned": "Alpinglita mesaĝo",
+  "status.pinned": "Alpinglita afiŝo",
  "status.read_more": "Legi pli",
  "status.reblog": "Diskonigi",
  "status.reblog_private": "Diskonigi kun la sama videbleco",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Respuesta privada",
  "notification.label.reply": "Respuesta",
  "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te mencionó",
  "notification.moderation-warning.learn_more": "Aprendé más",
  "notification.moderation_warning": "Recibiste una advertencia de moderación",
  "notification.moderation_warning.action_delete_statuses": "Se eliminaron algunos de tus mensajes.",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Respuesta privada",
  "notification.label.reply": "Respuesta",
  "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te ha mencionado",
  "notification.moderation-warning.learn_more": "Saber más",
  "notification.moderation_warning": "Has recibido una advertencia de moderación",
  "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
@ -852,11 +853,11 @@
  "upload_error.poll": "Subida de archivos no permitida con encuestas.",
  "upload_form.audio_description": "Describir para personas con problemas auditivos",
  "upload_form.description": "Describir para los usuarios con dificultad visual",
-  "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsa la barra espaciadora o la tecla Enter. Mientras arrastras, utiliza las teclas de flecha para mover el archivo multimedia en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsa Escape para cancelar.",
-  "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
-  "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} se ha movido.",
-  "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
+  "upload_form.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": "Arrastre cancelado. El archivo adjunto {item} fue 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} fue movido.",
+  "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",
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Respuesta privada",
  "notification.label.reply": "Respuesta",
  "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} te ha mencionado",
  "notification.moderation-warning.learn_more": "Saber más",
  "notification.moderation_warning": "Has recibido una advertencia de moderación",
  "notification.moderation_warning.action_delete_statuses": "Se han eliminado algunas de tus publicaciones.",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Yksityinen vastaus",
  "notification.label.reply": "Vastaus",
  "notification.mention": "Maininta",
+  "notification.mentioned_you": "{name} mainitsi sinut",
  "notification.moderation-warning.learn_more": "Lue lisää",
  "notification.moderation_warning": "Olet saanut moderointivaroituksen",
  "notification.moderation_warning.action_delete_statuses": "Julkaisujasi on poistettu.",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Privat svar",
  "notification.label.reply": "Svara",
  "notification.mention": "Umrøð",
+  "notification.mentioned_you": "{name} nevndi teg",
  "notification.moderation-warning.learn_more": "Lær meira",
  "notification.moderation_warning": "Tú hevur móttikið eina umsjónarávaring",
  "notification.moderation_warning.action_delete_statuses": "Onkrir av tínum postum eru strikaðir.",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@ -852,6 +852,7 @@
  "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.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",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@ -852,6 +852,7 @@
  "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.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",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Dataferkear beheind",
  "alert.unexpected.message": "Der is in ûnferwachte flater bard.",
  "alert.unexpected.title": "Oepsy!",
+  "alt_text_badge.title": "Alternative tekst",
  "announcement.announcement": "Oankundiging",
  "attachments_list.unprocessed": "(net ferwurke)",
  "audio.hide": "Audio ferstopje",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Net ien op dizze server kin jo folgje.",
  "domain_block_modal.they_wont_know": "Se krije net te witten dat se blokkearre wurde.",
  "domain_block_modal.title": "Domein blokkearje?",
+  "domain_block_modal.you_will_lose_num_followers": "Jo ferlieze {followersCount, plural, one {{followersCountDisplay} folger} other {{followersCountDisplay} folgers}} en {followingCount, plural, one {{followingCountDisplay} persoan dy’t jo folgje} other {{followingCountDisplay} persoanen dy’t jo folgje}}.",
+  "domain_block_modal.you_will_lose_relationships": "Jo ferlieze alle folgers en minsken dy’t jo folgje fan dizze server.",
  "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
  "domain_pill.activitypub_lets_connect": "It soarget derfoar dat jo net allinnich mar ferbine en kommunisearje kinne mei minsken op Mastodon, mar ek mei oare sosjale apps.",
  "domain_pill.activitypub_like_language": "ActivityPub is de taal dy’t Mastodon mei oare sosjale netwurken sprekt.",
@ -433,6 +436,8 @@
  "lightbox.close": "Slute",
  "lightbox.next": "Folgjende",
  "lightbox.previous": "Foarige",
+  "lightbox.zoom_in": "Oarspronklike grutte toane",
+  "lightbox.zoom_out": "Passend toane",
  "limited_account_hint.action": "Profyl dochs besjen",
  "limited_account_hint.title": "Dit profyl is troch de behearders fan {domain} ferstoppe.",
  "link_preview.author": "Troch {name}",
@ -454,6 +459,7 @@
  "lists.subheading": "Jo listen",
  "load_pending": "{count, plural, one {# nij item} other {# nije items}}",
  "loading_indicator.label": "Lade…",
+  "media_gallery.hide": "Ferstopje",
  "moved_to_account_banner.text": "Omdat jo nei {movedToAccount} ferhuze binne is jo account {disabledAccount} op dit stuit útskeakele.",
  "mute_modal.hide_from_notifications": "Meldingen ferstopje",
  "mute_modal.hide_options": "Opsjes ferstopje",
@ -510,6 +516,7 @@
  "notification.label.private_reply": "Priveereaksje",
  "notification.label.reply": "Beäntwurdzje",
  "notification.mention": "Fermelding",
+  "notification.mentioned_you": "{name} hat dy fermeld",
  "notification.moderation-warning.learn_more": "Mear ynfo",
  "notification.moderation_warning": "Jo hawwe in moderaasje-warskôging ûntfongen",
  "notification.moderation_warning.action_delete_statuses": "Guon fan jo berjochten binne fuortsmiten.",
@ -774,6 +781,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 +790,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 +815,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 +853,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",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Cuingeachadh ùine",
  "alert.unexpected.message": "Thachair mearachd ris nach robh dùil.",
  "alert.unexpected.title": "Oich!",
+  "alt_text_badge.title": "Roghainn teacsa",
  "announcement.announcement": "Brath-fios",
  "attachments_list.unprocessed": "(gun phròiseasadh)",
  "audio.hide": "Falaich an fhuaim",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "Chan urrainn do neach sam bith a th’ air an fhrithealaiche seo do leantainn.",
  "domain_block_modal.they_wont_know": "Cha bhi fios aca gun deach am bacadh.",
  "domain_block_modal.title": "A bheil thu airson an àrainn a bhacadh?",
+  "domain_block_modal.you_will_lose_num_followers": "Caillidh tu {followersCount, plural, one {{followersCountDisplay} neach-leantainn} two {{followersCountDisplay} luchd-leantainn} few {{followersCountDisplay} luchd-leantainn} other {{followersCountDisplay} luchd-leantainn}} ’s {followingCount, plural, one {{followingCountDisplay} neach a tha thu a’ leantainn} two {{followingCountDisplay} daoine a tha thu a’ leantainn} few {{followingCountDisplay} daoine a tha thu a’ leantainn} other {{followingCountDisplay} daoine a tha thu a’ leantainn}}.",
+  "domain_block_modal.you_will_lose_relationships": "Caillidh tu a h-uile luchd-leantainn ’s neach a leanas tu air an fhrithealaiche seo.",
  "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
  "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
  "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
@ -330,7 +333,7 @@
  "footer.about": "Mu dhèidhinn",
  "footer.directory": "Eòlaire nam pròifil",
  "footer.get_app": "Faigh an aplacaid",
-  "footer.invite": "Thoir cuireadh do dhaoine",
+  "footer.invite": "Thoir cuireadh",
  "footer.keyboard_shortcuts": "Ath-ghoiridean a’ mheur-chlàir",
  "footer.privacy_policy": "Poileasaidh prìobhaideachd",
  "footer.source_code": "Seall am bun-tùs",
@ -849,6 +852,11 @@
  "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
  "upload_form.audio_description": "Mìnich e dhan fheadhainn le èisteachd bheag",
  "upload_form.description": "Mìnich e dhan fheadhainn le cion-lèirsinne",
+  "upload_form.drag_and_drop.instructions": "Airson ceanglachan meadhain a thogail, brùth air space no enter. Fhad ’ a bhios tu ’ga shlaodadh, cleachd na h-iuchraichean-saighde airson an ceanglachan meadhain a ghluasad gu comhair sam bith. Brùth air space no enter a-rithist airson an ceanglachen meadhain a leigeil às air an ionad ùr aige no brùth air escape airson sgur dheth.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Chaidh sgur dhen t-slaodadh. Chaidh an ceanglachan meadhain {item} a leigeil às.",
+  "upload_form.drag_and_drop.on_drag_end": "Chaidh an ceanglachan meadhain {item} a leigeil às.",
+  "upload_form.drag_and_drop.on_drag_over": "Chaidh an ceanglachan meadhain {item} a ghluasad.",
+  "upload_form.drag_and_drop.on_drag_start": "Chaidh an ceanglachan meadhain {item} a thogail.",
  "upload_form.edit": "Deasaich",
  "upload_form.thumbnail": "Atharraich an dealbhag",
  "upload_form.video_description": "Mìnich e dhan fheadhainn le èisteachd bheag no cion-lèirsinne",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@ -193,7 +193,7 @@
  "confirmations.reply.message": "Ao responder sobrescribirás a mensaxe que estás a compor. Tes a certeza de que queres continuar?",
  "confirmations.reply.title": "Editar a publicación?",
  "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Desexas deixar de seguir a {name}?",
+  "confirmations.unfollow.message": "Tes certeza de querer deixar de seguir a {name}?",
  "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
  "content_warning.hide": "Agochar publicación",
  "content_warning.show": "Mostrar igualmente",
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Resposta privada",
  "notification.label.reply": "Resposta",
  "notification.mention": "Mención",
+  "notification.mentioned_you": "{name} mencionoute",
  "notification.moderation-warning.learn_more": "Saber máis",
  "notification.moderation_warning": "Recibiches unha advertencia da moderación",
  "notification.moderation_warning.action_delete_statuses": "Algunha das túas publicacións foron eliminadas.",
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@ -1,5 +1,5 @@
 {
-  "about.blocks": "שרתים שנחסמו על ידי המנהלים",
+  "about.blocks": "שרתים מוגבלים",
  "about.contact": "יצירת קשר:",
  "about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "הסיבה אינה זמינה",
@ -34,9 +34,9 @@
  "account.follow_back": "לעקוב בחזרה",
  "account.followers": "עוקבים",
  "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
-  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{count} עוקבים}}",
+  "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
  "account.following": "נעקבים",
-  "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {count}}}",
+  "account.following_counter": "{count, plural,one {עוקב אחרי {count}}other {עוקב אחרי {counter}}}",
  "account.follows.empty": "משתמש זה עדיין לא עוקב אחרי אף אחד.",
  "account.go_to_profile": "מעבר לפרופיל",
  "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
@ -62,7 +62,7 @@
  "account.requested_follow": "{name} ביקשו לעקוב אחריך",
  "account.share": "שתף את הפרופיל של @{name}",
  "account.show_reblogs": "הצג הדהודים מאת @{name}",
-  "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "account.statuses_counter": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
  "account.unblock": "להסיר חסימה ל- @{name}",
  "account.unblock_domain": "הסירי את החסימה של קהילת {domain}",
  "account.unblock_short": "הסר חסימה",
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "חלה הגבלה על קצב התעבורה",
  "alert.unexpected.message": "אירעה שגיאה בלתי צפויה.",
  "alert.unexpected.title": "אופס!",
+  "alt_text_badge.title": "כיתוב חלופי",
  "announcement.announcement": "הכרזה",
  "attachments_list.unprocessed": "(לא מעובד)",
  "audio.hide": "השתק",
@ -221,6 +222,8 @@
  "domain_block_modal.they_cant_follow": "משתמש משרת זה לא יכול לעקוב אחריך.",
  "domain_block_modal.they_wont_know": "הם לא ידעו כי נחסמו.",
  "domain_block_modal.title": "לחסום שרת?",
+  "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural,one {יאבד לך עוקב אחד}other {יאבדו לך {followersCountDisplay} עוקבים}} {followingCount, plural,one  {ונעקב אחד}other {ו־{followingCountDisplay} נעקבים}}.",
+  "domain_block_modal.you_will_lose_relationships": "יאבדו לך כל העוקבים והנעקבים משרת זה.",
  "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
  "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
  "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
@ -346,9 +349,9 @@
  "hashtag.column_settings.tag_mode.any": "לפחות אחד מאלה",
  "hashtag.column_settings.tag_mode.none": "אף אחד מאלה",
  "hashtag.column_settings.tag_toggle": "כלול תגיות נוספות בטור זה",
-  "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{count} משתתפיםות}}",
-  "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}} היום",
+  "hashtag.counter_by_accounts": "{count, plural,one{{count} משתתף.ת}other{{counter} משתתפיםות}}",
+  "hashtag.counter_by_uses": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}} היום",
  "hashtag.follow": "לעקוב אחרי תגית",
  "hashtag.unfollow": "להפסיק לעקוב אחרי תגית",
  "hashtags.and_other": "…{count, plural,other {ועוד #}}",
@ -439,7 +442,7 @@
  "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
  "link_preview.author": "מאת {name}",
  "link_preview.more_from_author": "עוד מאת {name}",
-  "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{count} הודעות} other {{count} הודעות}}",
+  "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
  "lists.account.add": "הוסף לרשימה",
  "lists.account.remove": "הסר מרשימה",
  "lists.delete": "מחיקת רשימה",
@ -513,6 +516,7 @@
  "notification.label.private_reply": "תשובה בפרטי",
  "notification.label.reply": "תשובה",
  "notification.mention": "אזכור",
+  "notification.mentioned_you": "אוזכרת על ידי {name}",
  "notification.moderation-warning.learn_more": "למידע נוסף",
  "notification.moderation_warning": "קיבלת אזהרה מצוות ניהול התוכן",
  "notification.moderation_warning.action_delete_statuses": "חלק מהודעותיך הוסרו.",
@ -837,7 +841,7 @@
  "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
  "time_remaining.moments": "רגעים נותרו",
  "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
-  "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
+  "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{counter} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
  "trends.trending_now": "נושאים חמים",
  "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",
  "units.short.billion": "{count} מליארד",
@ -849,6 +853,11 @@
  "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
  "upload_form.audio_description": "תאר/י עבור לקויי שמיעה",
  "upload_form.description": "תיאור לכבדי ראיה",
+  "upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
+  "upload_form.drag_and_drop.on_drag_cancel": "הגרירה בוטלה. קובץ המדיה {item} נעזב.",
+  "upload_form.drag_and_drop.on_drag_end": "קובץ המדיה {item} נעזב.",
+  "upload_form.drag_and_drop.on_drag_over": "קובץ המדיה {item} הוזז.",
+  "upload_form.drag_and_drop.on_drag_start": "קובץ המדיה {item} נבחר.",
  "upload_form.edit": "עריכה",
  "upload_form.thumbnail": "שנה/י תמונה ממוזערת",
  "upload_form.video_description": "תאר/י עבור לקויי שמיעה ולקויי ראייה",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Adatforgalom korlátozva",
  "alert.unexpected.message": "Váratlan hiba történt.",
  "alert.unexpected.title": "Hoppá!",
+  "alt_text_badge.title": "Helyettesítő szöveg",
  "announcement.announcement": "Közlemény",
  "attachments_list.unprocessed": "(feldolgozatlan)",
  "audio.hide": "Hang elrejtése",
@ -515,6 +516,7 @@
  "notification.label.private_reply": "Privát válasz",
  "notification.label.reply": "Válasz",
  "notification.mention": "Említés",
+  "notification.mentioned_you": "{name} megemlített",
  "notification.moderation-warning.learn_more": "További információ",
  "notification.moderation_warning": "Moderációs figyelmeztetést kaptál",
  "notification.moderation_warning.action_delete_statuses": "Néhány bejegyzésedet eltávolították.",
@ -851,6 +853,11 @@
  "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
  "upload_form.audio_description": "Leírás siket vagy hallássérült emberek számára",
  "upload_form.description": "Leírás vak vagy gyengénlátó emberek számára",
+  "upload_form.drag_and_drop.instructions": "Egy médiamelléklet kiválasztásához nyomj Szóközt vagy Entert. Húzás közben használd a nyílgombokat a médiamelléklet adott irányba történő mozgatásához. A médiamelléklet új pozícióba helyezéséhez nyomd meg a Szóközt vagy az Entert, vagy a megszakításhoz nyomd meg az Esc gombot.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Az áthúzás megszakítva. A(z) {item} médiamelléklet el lett dobva.",
+  "upload_form.drag_and_drop.on_drag_end": "A(z) {item} médiamelléklet el lett dobva.",
+  "upload_form.drag_and_drop.on_drag_over": "A(z) {item} médiamelléklet át lett helyezve.",
+  "upload_form.drag_and_drop.on_drag_start": "A(z) {item} médiamelléklet fel lett véve.",
  "upload_form.edit": "Szerkesztés",
  "upload_form.thumbnail": "Bélyegkép megváltoztatása",
  "upload_form.video_description": "Leírás siket, hallássérült, vak vagy gyengénlátó emberek számára",
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Með takmörkum",
  "alert.unexpected.message": "Upp kom óvænt villa.",
  "alert.unexpected.title": "Úbbs!",
+  "alt_text_badge.title": "Hjálpartexti mynda",
  "announcement.announcement": "Auglýsing",
  "attachments_list.unprocessed": "(óunnið)",
  "audio.hide": "Fela hljóð",
@ -433,6 +434,8 @@
  "lightbox.close": "Loka",
  "lightbox.next": "Næsta",
  "lightbox.previous": "Fyrra",
+  "lightbox.zoom_in": "Renna að raunstærð",
+  "lightbox.zoom_out": "Renna að svo passi",
  "limited_account_hint.action": "Birta notandasniðið samt",
  "limited_account_hint.title": "Þetta notandasnið hefur verið falið af umsjónarmönnum {domain}.",
  "link_preview.author": "Frá {name}",
@ -511,6 +514,7 @@
  "notification.label.private_reply": "Einkasvar",
  "notification.label.reply": "Svara",
  "notification.mention": "Minnst á",
+  "notification.mentioned_you": "{name} minntist á þig",
  "notification.moderation-warning.learn_more": "Kanna nánar",
  "notification.moderation_warning": "Þú hefur fengið aðvörun frá umsjónarmanni",
  "notification.moderation_warning.action_delete_statuses": "Sumar færslurnar þínar hafa verið fjarlægðar.",
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Rispondi in privato",
  "notification.label.reply": "Rispondi",
  "notification.mention": "Menziona",
+  "notification.mentioned_you": "{name} ti ha menzionato",
  "notification.moderation-warning.learn_more": "Scopri di più",
  "notification.moderation_warning": "Hai ricevuto un avviso di moderazione",
  "notification.moderation_warning.action_delete_statuses": "Alcuni dei tuoi post sono stati rimossi.",
@ -852,6 +853,11 @@
  "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
  "upload_form.audio_description": "Descrizione per persone con deficit uditivi",
  "upload_form.description": "Descrizione per ipovedenti",
+  "upload_form.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
+  "upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",
+  "upload_form.drag_and_drop.on_drag_over": "L'allegato multimediale {item} è stato spostato.",
+  "upload_form.drag_and_drop.on_drag_start": "L'allegato multimediale {item} è stato ricevuto.",
  "upload_form.edit": "Modifica",
  "upload_form.thumbnail": "Cambia la miniatura",
  "upload_form.video_description": "Descrizione per persone con deficit uditivi o ipovedenti",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.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": "音声を閉じる",
@ -513,6 +514,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": "あなたによるいくつかの投稿が削除されました。",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -1,5 +1,5 @@
 {
-  "about.blocks": "Ulac agbur",
+  "about.blocks": "Iqeddacen yettwaɛassen",
  "about.contact": "Anermis:",
  "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
  "about.domain_blocks.no_reason_available": "Ulac taɣẓint",
@ -278,6 +278,8 @@
  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} assa",
  "hashtag.follow": "Ḍfeṛ ahacṭag",
  "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
+  "hints.threads.replies_may_be_missing": "Tiririyin d-yusan deg iqeddacen nniḍen, yezmer ur d-ddant ara.",
+  "hints.threads.see_more": "Wali ugar n tririt deg {domain}",
  "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
  "home.column_settings.show_replies": "Ssken-d tiririyin",
  "home.hide_announcements": "Ffer ulɣuyen",
@ -550,6 +552,7 @@
  "report_notification.attached_statuses": "{count, plural, one {{count} n tsuffeɣt} other {{count} n tsuffiɣin}} ttwaqnent",
  "report_notification.categories.legal": "Azerfan",
  "report_notification.categories.other": "Ayen nniḍen",
+  "report_notification.categories.other_sentence": "ayen nniḍen",
  "report_notification.categories.spam": "Aspam",
  "report_notification.categories.spam_sentence": "aspam",
  "report_notification.open": "Ldi aneqqis",
@ -584,11 +587,13 @@
  "status.bookmark": "Creḍ",
  "status.cancel_reblog_private": "Sefsex beṭṭu",
  "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
+  "status.continued_thread": "Asqerdec yettkemmil",
  "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
  "status.delete": "Kkes",
  "status.direct": "Bder-d @{name} weḥd-s",
  "status.direct_indicator": "Abdar uslig",
  "status.edit": "Ẓreg",
+  "status.edited": "Taẓrigt taneggarut {date}",
  "status.edited_x_times": "Tettwaẓreg {count, plural, one {{count} n tikkelt} other {{count} n tikkal}}",
  "status.embed": "Awi-d tangalt n weslaɣ",
  "status.favourite": "Amenyaf",
@ -614,9 +619,10 @@
  "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
  "status.redraft": "Kkes tɛiwdeḍ tira",
  "status.remove_bookmark": "Kkes tacreḍt",
+  "status.replied_in_thread": "Y·t·erra-d deg usqerdec",
  "status.replied_to": "Y·terra-yas i {name}",
  "status.reply": "Err",
-  "status.replyAll": "Err i lxiḍ",
+  "status.replyAll": "Err i wesqerdec",
  "status.report": "Cetki ɣef @{name}",
  "status.sensitive_warning": "Agbur amḥulfu",
  "status.share": "Bḍu",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@ -317,7 +317,7 @@
  "follow_suggestions.curated_suggestion": "스태프의 추천",
  "follow_suggestions.dismiss": "다시 보지 않기",
  "follow_suggestions.featured_longer": "{domain} 팀이 손수 고름",
-  "follow_suggestions.friends_of_friends_longer": "내가 팔로우 하는 사람들 사이에서 인기",
+  "follow_suggestions.friends_of_friends_longer": "내가 팔로우한 사람들 사이에서 인기",
  "follow_suggestions.hints.featured": "이 프로필은 {domain} 팀이 손수 선택했습니다.",
  "follow_suggestions.hints.friends_of_friends": "이 프로필은 내가 팔로우 하는 사람들에게서 유명합니다.",
  "follow_suggestions.hints.most_followed": "이 프로필은 {domain}에서 가장 많이 팔로우 된 사람들 중 하나입니다.",
@ -516,6 +516,7 @@
  "notification.label.private_reply": "개인 답글",
  "notification.label.reply": "답글",
  "notification.mention": "멘션",
+  "notification.mentioned_you": "{name} 님의 멘션",
  "notification.moderation-warning.learn_more": "더 알아보기",
  "notification.moderation_warning": "중재 경고를 받았습니다",
  "notification.moderation_warning.action_delete_statuses": "게시물 몇 개가 삭제되었습니다.",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@ -504,22 +504,23 @@
  "notification.admin.report_statuses": "{name} rapporteerde {target} voor {category}",
  "notification.admin.report_statuses_other": "{name} rapporteerde {target}",
  "notification.admin.sign_up": "{name} heeft zich geregistreerd",
-  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben zich geregistreerd",
+  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben zich geregistreerd",
  "notification.favourite": "{name} markeerde jouw bericht als favoriet",
-  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht als favoriet gemarkeerd",
+  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht als favoriet gemarkeerd",
  "notification.follow": "{name} volgt jou nu",
-  "notification.follow.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben je gevolgd",
+  "notification.follow.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben je gevolgd",
  "notification.follow_request": "{name} wil jou graag volgen",
-  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben gevraagd om je te volgen",
+  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben gevraagd om je te volgen",
  "notification.label.mention": "Vermelding",
  "notification.label.private_mention": "Privébericht",
  "notification.label.private_reply": "Privéreactie",
  "notification.label.reply": "Reactie",
  "notification.mention": "Vermelding",
+  "notification.mentioned_you": "Je bent vermeld door {name}",
  "notification.moderation-warning.learn_more": "Meer informatie",
  "notification.moderation_warning": "Je hebt een moderatie-waarschuwing ontvangen",
  "notification.moderation_warning.action_delete_statuses": "Sommige van je berichten zijn verwijderd.",
-  "notification.moderation_warning.action_disable": "Je account is uitgeschakeld.",
+  "notification.moderation_warning.action_disable": "Jouw account is uitgeschakeld.",
  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Sommige van je berichten zijn gemarkeerd als gevoelig.",
  "notification.moderation_warning.action_none": "Jouw account heeft een moderatie-waarschuwing ontvangen.",
  "notification.moderation_warning.action_sensitive": "Je berichten worden vanaf nu als gevoelig gemarkeerd.",
@ -528,14 +529,14 @@
  "notification.own_poll": "Jouw peiling is beëindigd",
  "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
  "notification.reblog": "{name} boostte jouw bericht",
-  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht geboost",
+  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht geboost",
  "notification.relationships_severance_event": "Verloren verbindingen met {name}",
  "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
-  "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt.",
+  "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die je volgt.",
  "notification.relationships_severance_event.learn_more": "Meer informatie",
-  "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt, bent verloren.",
+  "notification.relationships_severance_event.user_domain_block": "Je hebt {target} geblokkeerd, waarmee je {followersCount} van je volgers en {followingCount, plural, one {# account} other {# accounts}} die je volgt, bent verloren.",
  "notification.status": "{name} heeft zojuist een bericht geplaatst",
-  "notification.update": "{name} heeft een bericht bewerkt",
+  "notification.update": "{name} bewerkte een bericht",
  "notification_requests.accept": "Accepteren",
  "notification_requests.accept_multiple": "{count, plural, one {# verzoek accepteren…} other {# verzoeken accepteren…}}",
  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Verzoek accepteren} other {Verzoeken accepteren}}",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Privat svar",
  "notification.label.reply": "Svar",
  "notification.mention": "Omtale",
+  "notification.mentioned_you": "{name} nemnde deg",
  "notification.moderation-warning.learn_more": "Lær meir",
  "notification.moderation_warning": "Du har mottatt ei moderasjonsåtvaring",
  "notification.moderation_warning.action_delete_statuses": "Nokre av innlegga dine har blitt fjerna.",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -502,6 +502,8 @@
  "notification.reblog": "{name} fremhevet ditt innlegg",
  "notification.status": "{name} la nettopp ut",
  "notification.update": "{name} redigerte et innlegg",
+  "notification_requests.minimize_banner": "Minimer banneret for filtrerte varsler",
+  "notification_requests.view": "Vis varsler",
  "notifications.clear": "Fjern varsler",
  "notifications.clear_confirmation": "Er du sikker på at du vil fjerne alle dine varsler permanent?",
  "notifications.column_settings.admin.report": "Nye rapporter:",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Odpowiedź prywatna",
  "notification.label.reply": "Odpowiedź",
  "notification.mention": "Wzmianka",
+  "notification.mentioned_you": "{name} wspomniał(a) o Tobie",
  "notification.moderation-warning.learn_more": "Dowiedz się więcej",
  "notification.moderation_warning": "Otrzymałeś/-łaś ostrzeżenie moderacyjne",
  "notification.moderation_warning.action_delete_statuses": "Niektóre twoje wpisy zostały usunięte.",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@ -437,6 +437,7 @@
  "lightbox.next": "Próximo",
  "lightbox.previous": "Anterior",
  "lightbox.zoom_in": "Voltar para o tamanho real",
+  "lightbox.zoom_out": "Zoom para ajustar",
  "limited_account_hint.action": "Exibir perfil mesmo assim",
  "limited_account_hint.title": "Este perfil foi ocultado pelos moderadores do {domain}.",
  "link_preview.author": "Por {name}",
@ -515,6 +516,7 @@
  "notification.label.private_reply": "Resposta privada",
  "notification.label.reply": "Resposta",
  "notification.mention": "Menção",
+  "notification.mentioned_you": "{name} te mencionou",
  "notification.moderation-warning.learn_more": "Aprender mais",
  "notification.moderation_warning": "Você recebeu um aviso de moderação",
  "notification.moderation_warning.action_delete_statuses": "Algumas das suas publicações foram removidas.",
@ -813,7 +815,7 @@
  "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
  "status.redraft": "Excluir e rascunhar",
  "status.remove_bookmark": "Remover do Salvos",
-  "status.replied_in_thread": "Respondido na discussão",
+  "status.replied_in_thread": "Respondido na conversa",
  "status.replied_to": "Em resposta a {name}",
  "status.reply": "Responder",
  "status.replyAll": "Responder a conversa",
@ -851,6 +853,11 @@
  "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
  "upload_form.audio_description": "Descrever para deficientes auditivos",
  "upload_form.description": "Descrever para deficientes visuais",
+  "upload_form.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
+  "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
+  "upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",
+  "upload_form.drag_and_drop.on_drag_over": "O anexo de mídia {item} foi movido.",
+  "upload_form.drag_and_drop.on_drag_start": "Foi coletado o anexo de mídia {item}.",
  "upload_form.edit": "Editar",
  "upload_form.thumbnail": "Alterar miniatura",
  "upload_form.video_description": "Descrever para deficientes auditivos ou visuais",
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Màssimu de rechestas barigadu",
  "alert.unexpected.message": "Ddoe est istada una faddina.",
  "alert.unexpected.title": "Oh!",
+  "alt_text_badge.title": "Testu alternativu",
  "announcement.announcement": "Annùntziu",
  "attachments_list.unprocessed": "(non protzessadu)",
  "audio.hide": "Cua s'àudio",
@ -97,6 +98,8 @@
  "block_modal.title": "Boles blocare s'utente?",
  "block_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent custa persone.",
  "boost_modal.combo": "Podes incarcare {combo} pro brincare custu sa borta chi benit",
+  "boost_modal.reblog": "Boles potentziare sa publicatzione?",
+  "boost_modal.undo_reblog": "Boles tzessare de potentziare sa publicatzione?",
  "bundle_column_error.copy_stacktrace": "Còpia s'informe de faddina",
  "bundle_column_error.error.body": "Sa pàgina pedida non faghiat a dda renderizare. Diat pòdere èssere pro neghe de una faddina in su còdighe nostru, o de unu problema de cumpatibilidade de su navigadore.",
  "bundle_column_error.error.title": "Oh, no!",
@ -104,11 +107,15 @@
  "bundle_column_error.network.title": "Faddina de connessione",
  "bundle_column_error.retry": "Torra·bi a proare",
  "bundle_column_error.return": "Torra a sa pàgina printzipale",
+  "bundle_column_error.routing.body": "Impossìbile agatare sa pàgina rechesta. Seguru chi s'URL in sa barra de indiritzos est curretu?",
  "bundle_column_error.routing.title": "404",
  "bundle_modal_error.close": "Serra",
  "bundle_modal_error.message": "Faddina in su carrigamentu de custu cumponente.",
  "bundle_modal_error.retry": "Torra·bi a proare",
+  "closed_registrations.other_server_instructions": "Dae chi Mastodon est detzentralizadu, podes creare unu contu in un'àteru serbidore e interagire cun custu.",
+  "closed_registrations_modal.description": "Sa creatzione de contos in {domain} no est possìbile in custu momentu, però tene in cunsideru chi non tenes bisòngiu de unu contu ispetzìficu in {domain} pro impreare Mastodon.",
  "closed_registrations_modal.find_another_server": "Agata un'àteru serbidore",
+  "closed_registrations_modal.title": "Su registru a Mastodon",
  "column.about": "Informatziones",
  "column.blocks": "Persones blocadas",
  "column.bookmarks": "Sinnalibros",
@ -142,6 +149,7 @@
  "compose.published.open": "Aberi",
  "compose.saved.body": "Publicatzione sarvada.",
  "compose_form.direct_message_warning_learn_more": "Àteras informatziones",
+  "compose_form.encryption_warning": "Is publicatziones a Mastodon no sunt critografados a nodu terminale. Non cumpartzas informatziones delicadas in Mastodon.",
  "compose_form.hashtag_warning": "Custa publicatzione no at a èssere ammustrada in peruna eticheta, dae chi no est pùblica. Isceti is publicatziones pùblicas podent èssere chircadas cun etichetas.",
  "compose_form.lock_disclaimer": "Su contu tuo no est {locked}. Cale si siat persone ti podet sighire pro bìdere is messàgios tuos chi imbies a sa gente chi ti sighit.",
  "compose_form.lock_disclaimer.lock": "blocadu",
@ -171,15 +179,23 @@
  "confirmations.discard_edit_media.confirm": "Iscarta",
  "confirmations.discard_edit_media.message": "Tenes modìficas non sarvadas a is descritziones o a is anteprimas de is cuntenutos, ddas boles iscartare su matessi?",
  "confirmations.edit.confirm": "Modìfica",
+  "confirmations.edit.message": "Modifichende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
+  "confirmations.edit.title": "Boles subraiscrìere sa publicatzione?",
  "confirmations.logout.confirm": "Essi·nche",
  "confirmations.logout.message": "Seguru chi boles essire?",
+  "confirmations.logout.title": "Boles serrare sa sessione?",
  "confirmations.mute.confirm": "A sa muda",
  "confirmations.redraft.confirm": "Cantzella e torra a fàghere",
  "confirmations.redraft.message": "Seguru chi boles cantzellare e torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.",
+  "confirmations.redraft.title": "Boles cantzellare e torrare a iscrìere sa publicatzione?",
  "confirmations.reply.confirm": "Risponde",
  "confirmations.reply.message": "Rispondende immoe as a subrascrìere su messàgiu chi ses iscriende. Seguru chi boles sighire?",
+  "confirmations.reply.title": "Boles subraiscrìere sa publicatzione?",
  "confirmations.unfollow.confirm": "Non sigas prus",
  "confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
+  "confirmations.unfollow.title": "Boles tzessare de sighire s'utente?",
+  "content_warning.hide": "Cua sa publicatzione",
+  "content_warning.show": "Ammustra·dda su pròpiu",
  "conversation.delete": "Cantzella arresonada",
  "conversation.mark_as_read": "Signala comente lèghidu",
  "conversation.open": "Ammustra arresonada",
@ -193,7 +209,10 @@
  "directory.recently_active": "Cun atividade dae pagu",
  "disabled_account_banner.account_settings": "Cunfiguratziones de su contu",
  "disabled_account_banner.text": "Su contu tuo {disabledAccount} no est ativu.",
+  "dismissable_banner.community_timeline": "Custas sunt is publicatziones pùblicas prus reghentes dae gente cun contu in {domain}.",
  "dismissable_banner.dismiss": "Iscarta",
+  "dismissable_banner.explore_links": "Custas sunt is istòrias de noas prus cumpartzidas in sa rete oe. Is istòrias prus noas publicadas dae gente prus diversa ant a èssere priorizadas.",
+  "dismissable_banner.explore_statuses": "Custas sunt publicatziones dae sa rete detzentralizada chi sunt retzende atentzione oe. Is publicatziones prus noas cun prus cumpartziduras e preferèntzias ant a èssere priorizadas.",
  "domain_block_modal.block": "Bloca su serbidore",
  "domain_block_modal.block_account_instead": "Bloca imbetzes a @{name}",
  "domain_block_modal.they_can_interact_with_old_posts": "Is persones de custu serbidore podent ancora interagire cun is publicatziones betzas tuas.",
@ -207,6 +226,7 @@
  "domain_pill.their_handle": "S'identificadore suo:",
  "domain_pill.their_server": "Sa domo digitale sua, in ue istant totu is publicatziones suas.",
  "domain_pill.username": "Nòmine de utente",
+  "domain_pill.whats_in_a_handle": "Ite est un'identificadore?",
  "domain_pill.your_handle": "S'identificadore tuo:",
  "domain_pill.your_server": "Sa domo digitale tua, in ue istant totu is publicatziones tuas. Custa non t'agradat? Tràmuda serbidore in cale si siat momentu e bati·ti fintzas in fatu is sighidores tuos.",
  "domain_pill.your_username": "S'identificadore ùnicu tuo in custu serbidore. Si podent agatare utentes cun su matessi nòmine de utente in àteros serbidores.",
@ -254,6 +274,7 @@
  "explore.trending_links": "Noas",
  "explore.trending_statuses": "Publicatziones",
  "explore.trending_tags": "Etichetas",
+  "filter_modal.added.context_mismatch_title": "Su cuntestu non currispondet.",
  "filter_modal.added.expired_title": "Filtru iscadidu.",
  "filter_modal.added.review_and_configure_title": "Cunfiguratziones de filtru",
  "filter_modal.added.settings_link": "pàgina de cunfiguratzione",
@ -277,7 +298,13 @@
  "follow_suggestions.featured_longer": "Seberadu a manu dae s'iscuadra de {domain}",
  "follow_suggestions.friends_of_friends_longer": "Populare intre persones chi sighis",
  "follow_suggestions.hints.featured": "Custu profilu est istadu seberadu a manu dae s'iscuadra {domain}.",
+  "follow_suggestions.personalized_suggestion": "Cussìgiu personalizadu",
+  "follow_suggestions.popular_suggestion": "Cussìgiu populare",
+  "follow_suggestions.popular_suggestion_longer": "Populare a {domain}",
+  "follow_suggestions.similar_to_recently_followed_longer": "Profilos sìmiles a is chi as sighidu de reghente",
  "follow_suggestions.view_all": "Ammustra totu",
+  "follow_suggestions.who_to_follow": "Chie sighire",
+  "followed_tags": "Etichetas sighidas",
  "footer.about": "Informatziones",
  "footer.directory": "Diretòriu de profilos",
  "footer.get_app": "Otene s'aplicatzione",
@ -302,6 +329,11 @@
  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}} oe",
  "hashtag.follow": "Sighi su hashtag",
  "hashtag.unfollow": "Non sigas prus s'eticheta",
+  "hashtags.and_other": "… e {count, plural, one {un'àteru} other {àteros #}}",
+  "hints.profiles.posts_may_be_missing": "Podet èssere chi ammanchent tzertas publicatziones de custu profilu.",
+  "hints.profiles.see_more_posts": "Bide prus publicatziones a {domain}",
+  "hints.threads.replies_may_be_missing": "Podet èssere chi ammanchent rispostas dae àteros serbidores.",
+  "hints.threads.see_more": "Bide prus rispostas a {domain}",
  "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
  "home.column_settings.show_replies": "Ammustra rispostas",
  "home.hide_announcements": "Cua annùntzios",
@ -309,7 +341,14 @@
  "home.pending_critical_update.link": "Ammustra is atualizatziones",
  "home.pending_critical_update.title": "Atualizatzione de seguresa crìtica a disponimentu.",
  "home.show_announcements": "Ammustra annùntzios",
+  "ignore_notifications_modal.disclaimer": "Mastodon non podet informare is utentes chi as innioradu is notìficas issoro. Inniorare notìficas no at a evitare chi s'imbient is messàgios.",
+  "ignore_notifications_modal.filter_instead": "Opuru filtra",
+  "ignore_notifications_modal.filter_to_act_users": "As a pòdere ancora atzetare, refudare o sinnalare a utentes",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrare agiudat a evitare possìbiles confusiones",
  "interaction_modal.description.reply": "Podes rispòndere a custa publicatzione cun unu contu de Mastodon.",
+  "interaction_modal.login.action": "Torra a sa pàgina printzipale",
+  "interaction_modal.login.prompt": "Su domìniu de su serbidore domèsticu tuo, pro esempru mastodon.social",
+  "interaction_modal.no_account_yet": "Non ses in Mastodon?",
  "interaction_modal.on_this_server": "In custu serbidore",
  "interaction_modal.title.follow": "Sighi a {name}",
  "interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
@ -353,11 +392,13 @@
  "lightbox.next": "Imbeniente",
  "lightbox.previous": "Pretzedente",
  "limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.",
+  "link_preview.shares": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
  "lists.account.add": "Agiunghe a sa lista",
  "lists.account.remove": "Boga dae sa lista",
  "lists.delete": "Cantzella sa lista",
  "lists.edit": "Modìfica sa lista",
  "lists.edit.submit": "Muda su tìtulu",
+  "lists.exclusive": "Cua custas publicatziones dae sa pàgina printzipale",
  "lists.new.create": "Agiunghe lista",
  "lists.new.title_placeholder": "Tìtulu de sa lista noa",
  "lists.replies_policy.followed": "Cale si siat persone chi sighis",
@ -368,7 +409,20 @@
  "lists.subheading": "Is listas tuas",
  "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
  "loading_indicator.label": "Carrighende…",
+  "media_gallery.hide": "Cua",
+  "moved_to_account_banner.text": "Su contu tuo {disabledAccount} est disativadu in custu momentu ca est istadu tramudadu a {movedToAccount}.",
+  "mute_modal.hide_from_notifications": "Cua dae is notìficas",
+  "mute_modal.hide_options": "Cua is optziones",
+  "mute_modal.indefinite": "Fintzas a cando no apo a torrare a ativare is notìficas",
+  "mute_modal.show_options": "Ammustra is optziones",
+  "mute_modal.they_can_mention_and_follow": "Ti podent mentovare e sighire, però no ddos as a bìdere.",
+  "mute_modal.they_wont_know": "No ant a ischire chi ddos as postu a sa muda.",
+  "mute_modal.title": "Boles pònnere a custu contu a sa muda?",
+  "mute_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent a custa persone.",
+  "mute_modal.you_wont_see_posts": "At a pòdere bìdere is publicatziones tuas, però tue no as a bìdere cussas suas.",
  "navigation_bar.about": "Informatziones",
+  "navigation_bar.administration": "Amministratzione",
+  "navigation_bar.advanced_interface": "Aberi s'interfache web avantzada",
  "navigation_bar.blocks": "Persones blocadas",
  "navigation_bar.bookmarks": "Sinnalibros",
  "navigation_bar.community_timeline": "Lìnia de tempus locale",
@ -380,10 +434,13 @@
  "navigation_bar.favourites": "Preferidos",
  "navigation_bar.filters": "Faeddos a sa muda",
  "navigation_bar.follow_requests": "Rechestas de sighidura",
+  "navigation_bar.followed_tags": "Etichetas sighidas",
  "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
  "navigation_bar.lists": "Listas",
  "navigation_bar.logout": "Essi",
+  "navigation_bar.moderation": "Moderatzione",
  "navigation_bar.mutes": "Persones a sa muda",
+  "navigation_bar.opened_in_classic_interface": "Publicatziones, contos e àteras pàginas ispetzìficas sunt abertas in manera predefinida in s'interfache web clàssica.",
  "navigation_bar.personal": "Informatziones personales",
  "navigation_bar.pins": "Publicatziones apicadas",
  "navigation_bar.preferences": "Preferèntzias",
@ -391,10 +448,24 @@
  "navigation_bar.search": "Chirca",
  "navigation_bar.security": "Seguresa",
  "not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
+  "notification.admin.report": "{name} at sinnaladu a {target}",
+  "notification.admin.report_account": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target} pro {category}",
+  "notification.admin.report_account_other": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target}",
+  "notification.admin.report_statuses": "{name} at sinnaladu a {target} pro {category}",
+  "notification.admin.report_statuses_other": "{name} at sinnaladu a {target}",
  "notification.admin.sign_up": "{name} at aderidu",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {un'àtera persone} other {àteras # persones}} si sunt registradas",
  "notification.favourite": "{name} at marcadu comente a preferidu s'istadu tuo",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {un'àtera persone} other {àteras # persones}}</a> ant marcadu sa publicatzione tua comente preferida",
  "notification.follow": "{name} ti sighit",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {un'àtera persone} other {àteras # persones}} ti sighint",
  "notification.follow_request": "{name} at dimandadu de ti sighire",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {un'àtera persone} other {àteras # persones}} ant pedidu de ti sighire",
+  "notification.label.mention": "Mèntovu",
+  "notification.label.private_mention": "Mèntovu privadu",
+  "notification.label.private_reply": "Risposta privada",
+  "notification.label.reply": "Risposta",
+  "notification.mention": "Mèntovu",
  "notification.moderation-warning.learn_more": "Àteras informatziones",
  "notification.moderation_warning": "T'ant imbiadu un'avisu de moderatzione",
  "notification.moderation_warning.action_delete_statuses": "Unas cantas de is publicatziones tuas sunt istadas cantzelladas.",
@ -407,12 +478,30 @@
  "notification.own_poll": "Sondàgiu acabbadu",
  "notification.poll": "Unu sondàgiu in su chi as votadu est acabbadu",
  "notification.reblog": "{name} at cumpartzidu sa publicatzione tua",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {un'àtera persone} other {àteras # persones}}</a> ant potentziadu sa publicatzione tua",
  "notification.relationships_severance_event": "Connessiones pèrdidas cun {name}",
+  "notification.relationships_severance_event.account_suspension": "S'amministratzione de {from} at suspèndidu a {target}; custu bolet nàrrere chi non podes prus retzire atualizatziones dae in cue o interagire cun cussos contos.",
+  "notification.relationships_severance_event.domain_block": "S'amministratzione de {from} at blocadu a {target}, incluende {followersCount} sighiduras tuas e {followingCount, plural, one {un'àteru contu} other {àteros # contos}} chi sighis.",
  "notification.relationships_severance_event.learn_more": "Àteras informatziones",
+  "notification.relationships_severance_event.user_domain_block": "As blocadu a {target}, bogadu a {followersCount} contos chi ti sighint e {followingCount, plural, one {un'àteru contu} other {àteros # contos}} chi sighis.",
  "notification.status": "{name} at publicadu cosa",
  "notification.update": "{name} at modificadu una publicatzione",
  "notification_requests.accept": "Atzeta",
+  "notification_requests.accept_multiple": "{count, plural, one {Atzeta una rechesta…} other {Atzeta # rechestas…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Atzeta sa rechesta} other {Atzeta is rechestas}}",
+  "notification_requests.confirm_accept_multiple.message": "Ses atzetende {count, plural, one {una rechesta de notìfica} other {# rechestas de notìfica}}. Seguru chi boles sighire?",
+  "notification_requests.confirm_accept_multiple.title": "Boles atzetare is rechestas de notìfica?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Iscarta sa rechesta} other {Iscarta is rechestas}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Ses acanta de iscartare {count, plural, one {una rechesta de notìfica} other {# rechestas de notìfica}}. No nche {count, plural, one {} other {}} as a pòdere prus atzèdere in manera sèmplitze. Seguru chi boles sighire?",
+  "notification_requests.confirm_dismiss_multiple.title": "Boles iscartare is rechestas de notìfica?",
  "notification_requests.dismiss": "Iscarta",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Iscarta una rechesta…} other {Iscarta # rechestas…}}",
+  "notification_requests.edit_selection": "Modifica",
+  "notification_requests.exit_selection": "Fatu",
+  "notification_requests.explainer_for_limited_account": "Is notìficas de custu contu sunt istadas filtradas, ca su contu est istadu limitadu dae sa moderatzione.",
+  "notification_requests.explainer_for_limited_remote_account": "Is notìficas de custu contu sunt istadas filtradas, ca su contu o su serbidore suo est istadu limitadu dae sa moderatzione.",
+  "notification_requests.maximize": "Ismànnia",
+  "notification_requests.minimize_banner": "Mìnima su bànner de notìficas filtradas",
  "notification_requests.notifications_from": "Notìficas dae {name}",
  "notification_requests.title": "Notìficas filtradas",
  "notifications.clear": "Lìmpia notìficas",
@ -472,6 +561,11 @@
  "poll_button.add_poll": "Agiunghe unu sondàgiu",
  "poll_button.remove_poll": "Cantzella su sondàgiu",
  "privacy.change": "Modìfica s'istadu de riservadesa",
+  "privacy.direct.long": "Totu is utentes mentovados in sa publicatzione",
+  "privacy.direct.short": "Persones ispetzìficas",
+  "privacy.private.long": "Isceti chie ti sighit",
+  "privacy.private.short": "Sighiduras",
+  "privacy.public.long": "Cale si siat persone a intro o a foras de Mastodon",
  "privacy.public.short": "Pùblicu",
  "privacy_policy.last_updated": "Ùrtima atualizatzione: {date}",
  "privacy_policy.title": "Polìtica de riservadesa",
@ -497,34 +591,64 @@
  "report.categories.legal": "Giurìdicu",
  "report.categories.other": "Àteru",
  "report.categories.spam": "Àliga",
+  "report.category.subtitle": "Sèbera sa currispondèntzia prus arta",
+  "report.category.title": "Nara·nos ite sutzedet cun custu {type}",
  "report.category.title_account": "profilu",
  "report.category.title_status": "publicatzione",
  "report.close": "Fatu",
+  "report.comment.title": "Nch'at àteru chi depamus ischire?",
  "report.forward": "Torra a imbiare a {target}",
  "report.forward_hint": "Custu contu est de un'àteru serbidore. Ddi boles imbiare puru una còpia anònima de custu informe?",
  "report.mute": "A sa muda",
+  "report.mute_explanation": "No as a bìdere is publicatziones suas. Ti podet ancora sighire e bìdere is publicatziones, ma no at a ischire chi dd'as postu a sa muda.",
  "report.next": "Imbeniente",
  "report.placeholder": "Cummentos additzionales",
  "report.reasons.dislike": "Non mi praghet",
  "report.reasons.dislike_description": "Est una cosa chi non boles bìdere",
  "report.reasons.legal": "Illegale",
  "report.reasons.other": "Un'àtera cosa",
+  "report.reasons.other_description": "Su problema non currispondet a is àteras categorias",
  "report.reasons.spam": "Est àliga",
+  "report.rules.subtitle": "Seletziona totu is chi àplichent",
+  "report.statuses.subtitle": "Seletziona totu is chi àplichent",
  "report.submit": "Imbia",
  "report.target": "Informende de {target}",
+  "report.thanks.title": "Non boles bìdere custu?",
+  "report.thanks.title_actionable": "Gràtzias de sa sinnalatzione, dd'amus a averiguare.",
  "report.unfollow": "Non sigas prus a @{name}",
+  "report.unfollow_explanation": "Ses sighende custu contu. Si non boles bìdere is publicatziones suas in sa pàgina printzipale tua, no ddu sigas prus.",
  "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
  "report_notification.categories.legal": "Giurìdicu",
  "report_notification.categories.legal_sentence": "cuntenutu illegale",
  "report_notification.categories.other": "Àteru",
  "report_notification.categories.other_sentence": "àteru",
  "report_notification.categories.spam": "Àliga",
+  "report_notification.categories.spam_sentence": "àliga",
+  "report_notification.open": "Aberi una sinnalatzione",
+  "search.no_recent_searches": "Nissuna chirca reghente",
  "search.placeholder": "Chirca",
+  "search.quick_action.account_search": "Profilos chi currispondent cun {x}",
+  "search.quick_action.go_to_account": "Bae a su profilu {x}",
+  "search.quick_action.go_to_hashtag": "Bae a s'eticheta {x}",
+  "search.quick_action.open_url": "Aberi s'URL in Mastodon",
+  "search.quick_action.status_search": "Publicatziones chi currispondent cun {x}",
+  "search.search_or_paste": "Chirca o incolla un'URL",
+  "search_popout.full_text_search_disabled_message": "No a disponimentu a {domain}.",
+  "search_popout.full_text_search_logged_out_message": "Isceti a disponimentu cun sa sessione aberta.",
+  "search_popout.language_code": "Còdighe de limba ISO",
+  "search_popout.options": "Optziones de chirca",
+  "search_popout.quick_actions": "Atziones lestras",
+  "search_popout.recent": "Chircas reghentes",
+  "search_popout.specific_date": "data ispetzìfica",
  "search_popout.user": "utente",
  "search_results.accounts": "Profilos",
  "search_results.all": "Totus",
  "search_results.hashtags": "Etichetas",
+  "search_results.nothing_found": "Impossìbile agatare currispondèntzias pro custos tèrmines de chirca",
+  "search_results.see_all": "Bide totu",
  "search_results.statuses": "Publicatziones",
+  "search_results.title": "Chirca {q}",
+  "server_banner.about_active_users": "Gente chi at impreadu custu serbidore is ùrtimas 30 dies (Utentes cun Atividade a su Mese)",
  "server_banner.active_users": "utentes ativos",
  "server_banner.administered_by": "Amministradu dae:",
  "server_banner.server_stats": "Istatìsticas de su serbidore:",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -33,7 +33,7 @@
  "account.follow": "Sledovať",
  "account.follow_back": "Sledovať späť",
  "account.followers": "Sledovatelia",
-  "account.followers.empty": "Tento účet ešte nikto nesleduje.",
+  "account.followers.empty": "Ešte nikto nesleduje tohto užívateľa.",
  "account.followers_counter": "{count, plural, one {{counter} sledujúci} other {{counter} sledujúci}}",
  "account.following": "Sledovaný účet",
  "account.following_counter": "{count, plural, one {{counter} sledovaných} other {{counter} sledovaných}}",
@ -85,6 +85,7 @@
  "alert.rate_limited.title": "Priveľa žiadostí",
  "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
  "alert.unexpected.title": "Ups!",
+  "alt_text_badge.title": "Alternatívny popis",
  "announcement.announcement": "Oznámenie",
  "attachments_list.unprocessed": "(nespracované)",
  "audio.hide": "Skryť zvuk",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Përgjigje private",
  "notification.label.reply": "Përgjigje",
  "notification.mention": "Përmendje",
+  "notification.mentioned_you": "{name} ju ka përmendur",
  "notification.moderation-warning.learn_more": "Mësoni më tepër",
  "notification.moderation_warning": "Ju është dhënë një sinjalizim moderimi",
  "notification.moderation_warning.action_delete_statuses": "Disa nga postimet tuaja janë hequr.",
@ -852,6 +853,11 @@
  "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
  "upload_form.audio_description": "Përshkruajeni për persona me dëgjim të kufizuar",
  "upload_form.description": "Përshkruajeni për persona me probleme shikimi",
+  "upload_form.drag_and_drop.instructions": "Që të merrni një bashkëngjitje media, shtypni tastin Space ose Enter. Teksa bëhet tërheqje, përdorni tastet shigjetë për ta shpënë bashkëngjitjen media në cilëndo drejtori që doni. Shtypni sërish Space ose Enter që të lihet bashkëngjitja media në pozicionin e vet të ri, ose shtypni Esc, që të anulohet veprimi.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Tërheqja u anulua. Bashkëngjitja media {item} u la.",
+  "upload_form.drag_and_drop.on_drag_end": "Bashkëngjitja media {item} u la.",
+  "upload_form.drag_and_drop.on_drag_over": "Bashkëngjitja media {item} u lëviz.",
+  "upload_form.drag_and_drop.on_drag_start": "U mor bashkëngjitja media {item}.",
  "upload_form.edit": "Përpunoni",
  "upload_form.thumbnail": "Ndryshoni miniaturën",
  "upload_form.video_description": "Përshkruajeni për persona me dëgjim të kufizuar ose probleme shikimi",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@ -506,6 +506,7 @@
  "notification.label.private_reply": "Privata svar",
  "notification.label.reply": "Svar",
  "notification.mention": "Nämn",
+  "notification.mentioned_you": "{name} nämnde dig",
  "notification.moderation-warning.learn_more": "Läs mer",
  "notification.moderation_warning": "Du har fått en moderationsvarning",
  "notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -512,6 +512,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": "เอาโพสต์บางส่วนของคุณออกแล้ว",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@ -124,7 +124,7 @@
  "column.direct": "Özel değinmeler",
  "column.directory": "Profillere göz at",
  "column.domain_blocks": "Engellenen alan adları",
-  "column.favourites": "Favorilerin",
+  "column.favourites": "Gözdelerin",
  "column.firehose": "Anlık Akışlar",
  "column.follow_requests": "Takip istekleri",
  "column.home": "Anasayfa",
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Özel yanıt",
  "notification.label.reply": "Yanıt",
  "notification.mention": "Bahsetme",
+  "notification.mentioned_you": "{name} sizden söz etti",
  "notification.moderation-warning.learn_more": "Daha fazlası",
  "notification.moderation_warning": "Hesabınız bir denetim uyarısı aldı",
  "notification.moderation_warning.action_delete_statuses": "Bazı gönderileriniz kaldırıldı.",
@ -812,7 +813,7 @@
  "status.reblogged_by": "{name} yeniden paylaştı",
  "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
  "status.reblogs.empty": "Henüz hiç kimse bu gönderiyi yeniden paylaşmadı. Herhangi bir kullanıcı yeniden paylaştığında burada görüntülenecek.",
-  "status.redraft": "Sil,Düzenle ve Yeniden paylaş",
+  "status.redraft": "Sil,Düzenle ve yeniden-paylaş",
  "status.remove_bookmark": "Yer işaretini kaldır",
  "status.replied_in_thread": "Akışta yanıtlandı",
  "status.replied_to": "{name} kullanıcısına yanıt verdi",
@ -852,6 +853,11 @@
  "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
  "upload_form.audio_description": "İşitme kaybı olan kişiler için yazı ekleyiniz",
  "upload_form.description": "Görme engelliler için açıklama",
+  "upload_form.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
+  "upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",
+  "upload_form.drag_and_drop.on_drag_over": "Medya eklentisi {item} hareket ettirildi.",
+  "upload_form.drag_and_drop.on_drag_start": "Medya eklentisi {item} tutuldu.",
  "upload_form.edit": "Düzenle",
  "upload_form.thumbnail": "Küçük resmi değiştir",
  "upload_form.video_description": "İşitme kaybı veya görme engeli olan kişiler için açıklama ekleyiniz",
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Приватна відповідь",
  "notification.label.reply": "Відповідь",
  "notification.mention": "Згадка",
+  "notification.mentioned_you": "{name} згадує вас",
  "notification.moderation-warning.learn_more": "Докладніше",
  "notification.moderation_warning": "Ви отримали попередження модерації",
  "notification.moderation_warning.action_delete_statuses": "Деякі з ваших дописів було вилучено.",
@ -852,6 +853,11 @@
  "upload_error.poll": "Не можна завантажувати файли до опитувань.",
  "upload_form.audio_description": "Опишіть для людей із вадами слуху",
  "upload_form.description": "Опишіть для людей з вадами зору",
+  "upload_form.drag_and_drop.instructions": "Щоб вибрати медіавкладення, натисніть пробіл або Enter. Під час перетягування, використайте клавіші зі стрілками для переміщення вкладення в будь-якому напрямку. Натисніть пробіл або Enter знову, щоб залишити медіавкладення в новому положенні, або натисніть клавішу Escape, щоб скасувати.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Перетягування скасовано. Медіавкладення {item} прибрано.",
+  "upload_form.drag_and_drop.on_drag_end": "Медіавкладення {item} прибрано.",
+  "upload_form.drag_and_drop.on_drag_over": "Медіавкладення {item} переміщено.",
+  "upload_form.drag_and_drop.on_drag_start": "Медіавкладення {item} вибрано.",
  "upload_form.edit": "Змінити",
  "upload_form.thumbnail": "Змінити мініатюру",
  "upload_form.video_description": "Опишіть для людей із вадами слуху або зору",
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "Trả lời riêng",
  "notification.label.reply": "Trả lời",
  "notification.mention": "Lượt nhắc",
+  "notification.mentioned_you": "{name} nhắc đến bạn",
  "notification.moderation-warning.learn_more": "Tìm hiểu",
  "notification.moderation_warning": "Bạn vừa nhận một cảnh báo kiểm duyệt",
  "notification.moderation_warning.action_delete_statuses": "Một vài tút của bạn bị gỡ.",
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "私人回复",
  "notification.label.reply": "回复",
  "notification.mention": "提及",
+  "notification.mentioned_you": "{name} 提到了你",
  "notification.moderation-warning.learn_more": "了解更多",
  "notification.moderation_warning": "你收到了一条管理警告",
  "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@ -516,6 +516,7 @@
  "notification.label.private_reply": "私訊回嘟",
  "notification.label.reply": "回嘟",
  "notification.mention": "提及",
+  "notification.mentioned_you": "{name} 已提及您",
  "notification.moderation-warning.learn_more": "了解更多",
  "notification.moderation_warning": "您已收到管理員警告",
  "notification.moderation_warning.action_delete_statuses": "某些您的嘟文已被刪除。",
--- a/app/javascript/mastodon/service_worker/web_push_locales.js
+++ b/app/javascript/mastodon/service_worker/web_push_locales.js
@ -6,6 +6,12 @@
 const fs   = require('fs');
 const path = require('path');

+const { defineMessages } = require('react-intl');
+
+const messages = defineMessages({
+  mentioned_you: { id: 'notification.mentioned_you', defaultMessage: '{name} mentioned you' },
+});
+
 const filtered  = {};
 const filenames = fs.readdirSync(path.resolve(__dirname, '../locales'));

@ -20,7 +26,7 @@ filenames.forEach(filename => {
    'notification.favourite': full['notification.favourite'] || '',
    'notification.follow': full['notification.follow'] || '',
    'notification.follow_request': full['notification.follow_request'] || '',
-    'notification.mention': full['notification.mention'] || '',
+    'notification.mention': full[messages.mentioned_you.id] || '',
    'notification.reblog': full['notification.reblog'] || '',
    'notification.poll': full['notification.poll'] || '',
    'notification.status': full['notification.status'] || '',
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2077,7 +2077,6 @@ body > [data-popper-placement] {
  display: block;
  position: relative;
  border-radius: var(--avatar-border-radius);
-  background-color: var(--surface-background-color);

  img {
    width: 100%;
@ -2087,7 +2086,11 @@ body > [data-popper-placement] {
    display: inline-block; // to not show broken images
  }

-  &-inline {
+  &--loading {
+    background-color: var(--surface-background-color);
+  }
+
+  &--inline {
    display: inline-block;
    vertical-align: middle;
    margin-inline-end: 5px;
@ -10628,6 +10631,7 @@ noscript {
  gap: 8px;

  .logo {
+    width: 16px;
    height: 16px;
    color: $darker-text-color;
  }
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@ -86,7 +86,7 @@ class NotificationMailer < ApplicationMailer
  end

  def thread_by_conversation!
-    return if @status.conversation.nil?
+    return if @status&.conversation.nil?

    conversation_message_id = "<conversation-#{@status.conversation.id}.#{@status.conversation.created_at.to_date}@#{Rails.configuration.x.local_domain}>"

--- a/config/locales/activerecord.fy.yml
+++ b/config/locales/activerecord.fy.yml
@ -15,6 +15,12 @@ fy:
      user/invite_request:
        text: Reden
    errors:
+      attributes:
+        domain:
+          invalid: is in ûnjildige domeinnamme
+      messages:
+        invalid_domain_on_line: "%{value} is in ûnjildige domeinnamme"
+        too_many_lines: giet oer de limyt fan %{limit} rigels
      models:
        account:
          attributes:
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -446,6 +446,7 @@ ca:
        title: Blocar el nou domini de correu-e
      no_email_domain_block_selected: No s'han canviat els bloqueigs de domini perquè no se n'ha seleccionat cap
      not_permitted: No permés
+      resolved_dns_records_hint_html: El nom del domini resol als següents dominis MX, que són els responsables finals per a acceptar els correus. Blocar un domini MX blocarà els registres des de qualsevol adreça de correu que utilitzi el mateix domini MX, encara que el nom visible sigui diferent. <strong>Vigileu de no blocar els grans proveïdors de correu.</strong>
      resolved_through_html: Resolt mitjançant %{domain}
      title: Dominis de correu-e blocats
    export_domain_allows:
@ -800,6 +801,7 @@ ca:
      destroyed_msg: La càrrega al lloc s'ha suprimit correctament!
    software_updates:
      critical_update: Crítica - si us plau, actualitza ràpidament
+      description: Es recomana de mantenir actualizada la instal·lació de Mastodon per a beneficiar-se de les darreres correccions i característiques. A més, de vegades és fonamental actualitzar-la per a evitar problemes de seguretat. Per això Mastodon comprova si hi ha actualitzacions cada 30 minuts i us notificarà d'acord amb les preferències de notificacions de correu electrònic.
      documentation_link: Més informació
      release_notes: Notes de llançament
      title: Actualitzacions disponibles
@ -1155,6 +1157,7 @@ ca:
      account_status: Estat del compte
      confirming: Esperant que es completi la confirmació del correu-e.
      functional: El teu compte està completament operatiu.
+      pending: La vostra sol·licitud està pendent de revisió pel nostre personal. Això pot trigar una mica. Rebreu un correu electrònic quan s'aprovi.
      redirecting_to: El teu compte és inactiu perquè actualment està redirigint a %{acct}.
      self_destruct: Com que %{domain} tanca, només tindreu accés limitat al vostre compte.
      view_strikes: Veure accions del passat contra el teu compte
@ -1202,6 +1205,9 @@ ca:
      before: 'Abans de procedir, llegiu amb cura aquestes notes:'
      caches: El contingut que ha estat memoritzat en la memòria cau per altres servidors pot persistir
      data_removal: Els teus tuts i altres dades seran permanentment eliminades
+      email_change_html: Podeu <a href="%{path}">canviar l'adreça de correu </a> sense eliminar el vostre compte
+      email_contact_html: Si encara no arriba, podeu enviar un correu-e a <a href="mailto:%{email}">%{email}</a> per a demanar ajuda
+      email_reconfirmation_html: Si no rebeu el correu electrònic de confirmació <a href="%{path}">, podeu tornar-lo a demanar</a>
      irreversible: No seràs capaç de restaurar o reactivar el teu compte
      more_details_html: Per a més detalls, llegeix la <a href="%{terms_path}">política de privadesa</a>.
      username_available: El teu nom d'usuari esdevindrà altre cop disponible
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@ -931,6 +931,9 @@ cy:
        message_html: Nid ydych wedi diffinio unrhyw reolau gweinydd.
      sidekiq_process_check:
        message_html: Does dim proses Sidekiq yn rhedeg ar gyfer y ciw(iau) %{value}. Adolygwch eich ffurfweddiad Sidekiq
+      software_version_check:
+        action: Gweld y diweddariadau sydd ar gael
+        message_html: Mae diweddariad Mastodon ar gael.
      software_version_critical_check:
        action: Gweld y diweddariadau sydd ar gael
        message_html: Mae diweddariad hanfodol Mastodon ar gael, diweddarwch cyn gynted â phosibl.
@ -1796,6 +1799,7 @@ cy:
    delete: Dileu cyfrif
    development: Datblygu
    edit_profile: Golygu proffil
+    export: Allforio
    featured_tags: Prif hashnodau
    import: Mewnforio
    import_and_export: Mewnforio ac allforio
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@ -79,7 +79,7 @@ de:
      invite_request_text: Begründung für das Beitreten
      invited_by: Eingeladen von
      ip: IP-Adresse
-      joined: Beigetreten
+      joined: Mitglied seit
      location:
        all: Alle
        local: Lokal
--- a/config/locales/devise.eo.yml
+++ b/config/locales/devise.eo.yml
@ -73,9 +73,11 @@ eo:
          title: Unu el viaj sekurecaj ŝlosiloj estis forigita
      webauthn_disabled:
        explanation: Aŭtentigo per sekurecaj ŝlosiloj estas malŝaltita por via konto.
+        extra: Ensaluto nun eblas uzante nur la ĵetonon generitan de la parigita tempbazita unufoja pasvorta aplikaĵo.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo malebligita'
        title: Sekurecaj ŝlosiloj malaktivigitaj
      webauthn_enabled:
+        explanation: Sekurecŝlosila aŭtentigo estas ebligita por via konto.
        extra: Via sekureca ŝlosilo nun povas esti uzata por ensaluto.
        subject: 'Mastodon: sekureca-ŝlosila aŭtentigo ebligita'
        title: Sekurecaj ŝlosiloj aktivigitaj
--- a/config/locales/doorkeeper.el.yml
+++ b/config/locales/doorkeeper.el.yml
@ -60,6 +60,7 @@ el:
      error:
        title: Εμφανίστηκε σφάλμα
      new:
+        prompt_html: Το %{client_name} επιθυμεί το δικαίωμα πρόσβασης στον λογαριασμό σας. <strong>Εγκρίνετε αυτό το αίτημα μόνο αν αναγνωρίζετε και εμπιστεύεστε αυτήν την πηγή.</strong>
        review_permissions: Ανασκόπηση δικαιωμάτων
        title: Απαιτείται έγκριση
      show:
--- a/config/locales/doorkeeper.fy.yml
+++ b/config/locales/doorkeeper.fy.yml
@ -60,6 +60,7 @@ fy:
      error:
        title: Der is in flater bard
      new:
+        prompt_html: "%{client_name} freget om tagong ta jo account. <strong>Keur dit fersyk allinnich goed as jo dizze boarne werkenne en fertrouwe.</strong>"
        review_permissions: Tastimmingen beoardiele
        title: Autorisaasje fereaske
      show:
--- a/config/locales/doorkeeper.gl.yml
+++ b/config/locales/doorkeeper.gl.yml
@ -69,7 +69,7 @@ gl:
      buttons:
        revoke: Retirar autorización
      confirmations:
-        revoke: Estás segura?
+        revoke: Tes certeza?
      index:
        authorized_at: Autorizada o %{date}
        description_html: Estas aplicacións poden acceder á túa conta usando a API. Se ves aplicacións que non recoñeces, ou hai comportamentos non consentidos dalgunha delas, podes revogar o acceso.
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -953,6 +953,7 @@ el:
        used_by_over_week:
          one: Χρησιμοποιήθηκε από ένα άτομο την τελευταία εβδομάδα
          other: Χρησιμοποιήθηκε από %{count} άτομα την τελευταία εβδομάδα
+      title: Προτάσεις και τάσεις
      trending: Τάσεις
    warning_presets:
      add_new: Πρόσθεση νέου
@ -1037,7 +1038,9 @@ el:
      guide_link_text: Μπορεί να συνεισφέρει ο οποιοσδήποτε.
    sensitive_content: Ευαίσθητο περιεχόμενο
  application_mailer:
+    notification_preferences: Αλλαγή προτιμήσεων email
    salutation: "%{name},"
+    settings: 'Αλλαγή προτιμήσεων email: %{link}'
    unsubscribe: Κατάργηση εγγραφής
    view: 'Προβολή:'
    view_profile: Προβολή προφίλ
@ -1084,6 +1087,7 @@ el:
    or_log_in_with: Ή συνδέσου με
    privacy_policy_agreement_html: Έχω διαβάσει και συμφωνώ με την <a href="%{privacy_policy_path}" target="_blank">πολιτική απορρήτου</a>
    progress:
+      confirm: Επιβεβαίωση email
      details: Τα στοιχεία σας
      review: Η αξιολόγησή μας
      rules: Αποδοχή κανόνων
@ -1123,6 +1127,8 @@ el:
      view_strikes: Προβολή προηγούμενων ποινών εναντίον του λογαριασμού σας
    too_fast: Η φόρμα υποβλήθηκε πολύ γρήγορα, προσπαθήστε ξανά.
    use_security_key: Χρήση κλειδιού ασφαλείας
+  author_attribution:
+    example_title: Δείγμα κειμένου
  challenge:
    confirm: Συνέχεια
    hint_html: "<strong>Συμβουλή:</strong> Δεν θα σου ζητήσουμε τον κωδικό ασφαλείας σου ξανά για την επόμενη ώρα."
@ -1342,7 +1348,10 @@ el:
    time_started: Ξεκίνησε στις
    titles:
      blocking: Εισαγωγή αποκλεισμένων λογαριασμών
+      bookmarks: Εισαγωγή σελιδοδεικτών
+      domain_blocking: Εισαγωγή αποκλεισμένων τομέων
      following: Εισαγωγή λογαριασμών που ακολουθείτε
+      lists: Εισαγωγή λιστών
    type: Τύπος εισαγωγής
    type_groups:
      destructive: Μπλοκ & σίγαση
@ -1351,6 +1360,7 @@ el:
      bookmarks: Σελιδοδείκτες
      domain_blocking: Λίστα αποκλεισμένων τομέων
      following: Λίστα ατόμων που ακολουθείτε
+      lists: Λίστες
      muting: Λίστα αποσιωπήσεων
    upload: Μεταμόρφωση
  invites:
@ -1365,6 +1375,7 @@ el:
      '86400': 1 μέρα
    expires_in_prompt: Ποτέ
    generate: Δημιουργία συνδέσμου πρόσκλησης
+    invalid: Αυτή η πρόσκληση δεν είναι έγκυρη
    invited_by: 'Σε προσκάλεσε ο/η:'
    max_uses:
      one: 1 χρήσης
@ -1388,6 +1399,11 @@ el:
    failed_sign_in_html: Αποτυχημένη προσπάθεια σύνδεσης με %{method} από %{ip} (%{browser})
    successful_sign_in_html: Επιτυχής σύνδεση με %{method} από %{ip} (%{browser})
    title: Ιστορικό ελέγχου ταυτότητας
+  mail_subscriptions:
+    unsubscribe:
+      action: Ναι, κατάργηση συνδρομής
+      complete: Η συνδρομή καταργήθηκε
+      title: Κατάργηση συνδρομής
  media_attachments:
    validations:
      images_and_video: Δεν γίνεται να προσθέσεις βίντεο σε ανάρτηση που ήδη περιέχει εικόνες
@ -1467,6 +1483,7 @@ el:
    update:
      subject: "%{name} επεξεργάστηκε μια ανάρτηση"
  notifications:
+    email_events: Συμβάντα για ειδοποιήσεις μέσω email
    email_events_hint: 'Επέλεξε συμβάντα για τα οποία θέλεις να λαμβάνεις ειδοποιήσεις μέσω email:'
  number:
    human:
@ -1507,12 +1524,18 @@ el:
    other: Άλλες
    posting_defaults: Προεπιλογές ανάρτησης
    public_timelines: Δημόσιες ροές
+  privacy:
+    privacy: Απόρρητο
+    search: Αναζήτηση
  privacy_policy:
    title: Πολιτική Απορρήτου
  reactions:
    errors:
      limit_reached: Το όριο διαφορετικών αντιδράσεων ξεπεράστηκε
      unrecognized_emoji: δεν είναι ένα αναγνωρισμένο emoji
+  redirects:
+    prompt: Αν εμπιστεύεστε αυτόν τον σύνδεσμο, κάντε κλικ σε αυτόν για να συνεχίσετε.
+    title: Αποχωρείτε από το %{instance}.
  relationships:
    activity: Δραστηριότητα λογαριασμού
    confirm_follow_selected_followers: Είσαι βέβαιος ότι θες να ακολουθήσεις τους επιλεγμένους ακόλουθους;
@ -1548,6 +1571,9 @@ el:
    over_daily_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων για εκείνη τη μέρα
    over_total_limit: Έχεις υπερβεί το όριο των %{limit} προγραμματισμένων αναρτήσεων
    too_soon: Η προγραμματισμένη ημερομηνία πρέπει να είναι στο μέλλον
+  self_destruct:
+    lead_html: Δυστυχώς, το <strong>%{domain}</strong> κλείνει οριστικά. Αν είχατε λογαριασμό εκεί, δεν θα μπορείτε να συνεχίσετε τη χρήση του, αλλά μπορείτε ακόμα να ζητήσετε ένα αντίγραφο ασφαλείας των δεδομένων σας.
+    title: Αυτός ο διακομιστής κλείνει οριστικά
  sessions:
    activity: Τελευταία δραστηριότητα
    browser: Φυλλομετρητής
@ -1604,10 +1630,12 @@ el:
    delete: Διαγραφή λογαριασμού
    development: Ανάπτυξη
    edit_profile: Επεξεργασία προφίλ
+    export: Εξαγωγή
    featured_tags: Παρεχόμενες ετικέτες
    import: Εισαγωγή
    import_and_export: Εισαγωγή και εξαγωγή
    migrate: Μετακόμιση λογαριασμού
+    notifications: Ειδοποιήσεις μέσω email
    preferences: Προτιμήσεις
    profile: Προφίλ
    relationships: Ακολουθείς και σε ακολουθούν
@ -1615,6 +1643,12 @@ el:
    strikes: Παραπτώματα από ομάδα συντονισμού
    two_factor_authentication: Πιστοποίηση 2 παραγόντων
    webauthn_authentication: Κλειδιά ασφαλείας
+  severed_relationships:
+    download: Λήψη (%{count})
+    event_type:
+      account_suspension: Αναστολή λογαριασμού (%{target_name})
+      domain_block: Αναστολή διακομιστή (%{target_name})
+    type: Συμβάν
  statuses:
    attached:
      audio:
@ -1697,11 +1731,13 @@ el:
    contrast: Mastodon (Υψηλή αντίθεση)
    default: Mastodon (Σκοτεινό)
    mastodon-light: Mastodon (Ανοιχτόχρωμο)
+    system: Αυτόματο (θέμα συστήματος)
  time:
    formats:
      default: "%b %d, %Y, %H:%M"
      month: "%b %Y"
      time: "%H:%M"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
  two_factor_authentication:
    add: Προσθήκη
    disable: Απενεργοποίηση 2FA
@ -1789,6 +1825,10 @@ el:
      feature_action: Μάθε περισσότερα
      feature_audience: Το Mastodon σού παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σού επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
      feature_audience_title: Χτίσε το κοινό σου με σιγουριά
+      post_action: Σύνθεση
+      share_action: Κοινοποίηση
+      share_title: Μοιραστείτε το προφίλ σας στο Mastodon
+      sign_in_action: Σύνδεση
      subject: Καλώς ήρθες στο Mastodon
      title: Καλώς όρισες, %{name}!
  users:
@ -1798,7 +1838,10 @@ el:
    otp_lost_help_html: Αν χάσεις πρόσβαση και στα δύο, μπορείς να επικοινωνήσεις με %{email}
    signed_in_as: 'Έχεις συνδεθεί ως:'
  verification:
+    here_is_how: Δείτε πώς
    verification: Πιστοποίηση
+    verified_links: Οι επαληθευμένοι σύνδεσμοι σας
+    website_verification: Επαλήθευση ιστοτόπου
  webauthn_credentials:
    add: Προσθήκη νέου κλειδιού ασφαλείας
    create:
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@ -875,6 +875,9 @@ en-GB:
        message_html: You haven't defined any server rules.
      sidekiq_process_check:
        message_html: No Sidekiq process running for the %{value} queue(s). Please review your Sidekiq configuration
+      software_version_check:
+        action: See available updates
+        message_html: A Mastodon update is available.
      software_version_critical_check:
        action: See available updates
        message_html: A critical Mastodon update is available, please update as quickly as possible.
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@ -218,18 +218,22 @@ eo:
        update_custom_emoji: Ĝisdatigi proprajn emoĝiojn
        update_domain_block: Ĝigdatigi domajnan blokadon
        update_ip_block: Krei IP-regulon
+        update_report: Ĝisdatigo de Raporto
        update_status: Ĝisdatigi afiŝon
        update_user_role: Ĝisdatigi rolon
      actions:
        approve_appeal_html: "%{name} aprobis apelacion kontraŭ moderiga decido de %{target}"
        approve_user_html: "%{name} aprobis registriĝon de %{target}"
        assigned_to_self_report_html: "%{name} asignis signalon %{target} al si mem"
+        change_email_user_html: "%{name} ŝanĝis retadreson de uzanto %{target}"
        change_role_user_html: "%{name} ŝanĝis rolon de %{target}"
+        confirm_user_html: "%{name} konfirmis retadreson de uzanto %{target}"
        create_account_warning_html: "%{name} sendis averton al %{target}"
        create_announcement_html: "%{name} kreis novan anoncon %{target}"
        create_custom_emoji_html: "%{name} alŝutis novan emoĝion %{target}"
        create_domain_allow_html: "%{name} aldonis domajnon %{target} al la blanka listo"
        create_domain_block_html: "%{name} blokis domajnon %{target}"
+        create_email_domain_block_html: "%{name} blokis retpoŝtan domajnon %{target}"
        create_ip_block_html: "%{name} kreis regulon por IP %{target}"
        create_unavailable_domain_html: "%{name} ĉesis sendon al domajno %{target}"
        create_user_role_html: "%{name} kreis rolon de %{target}"
@ -238,6 +242,7 @@ eo:
        destroy_custom_emoji_html: "%{name} forigis emoĝion %{target}"
        destroy_domain_allow_html: "%{name} forigis domajnon %{target} el la blanka listo"
        destroy_domain_block_html: "%{name} malblokis domajnon %{target}"
+        destroy_email_domain_block_html: "%{name} malblokis retpoŝtan domajnon %{target}"
        destroy_instance_html: "%{name} forigis domajnon %{target}"
        destroy_ip_block_html: "%{name} forigis regulon por IP %{target}"
        destroy_status_html: "%{name} forigis mesaĝojn de %{target}"
@ -1270,6 +1275,8 @@ eo:
      merge_long: Konservi ekzistajn registrojn kaj aldoni novajn
      overwrite: Anstataŭigi
      overwrite_long: Anstataŭigi la nunajn registrojn per la novaj
+    preambles:
+      muting_html: Vi estas <strong>silentonta</strong> ĝis <strong>%{total_items} kontoj</strong> de <strong>%{filename}</strong>.
    preface: Vi povas importi datumojn, kiujn vi eksportis el alia servilo, kiel liston de homoj, kiujn vi sekvas aŭ blokas.
    recent_imports: Lastatempaj importoj
    states:
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@ -180,21 +180,21 @@ es-MX:
        confirm_user: Confirmar Usuario
        create_account_warning: Crear Advertencia
        create_announcement: Crear Anuncio
-        create_canonical_email_block: Crear Bloqueo de Correo Electrónico
+        create_canonical_email_block: Crear bloqueo de correo electrónico
        create_custom_emoji: Crear Emoji Personalizado
        create_domain_allow: Crear Permiso de Dominio
        create_domain_block: Crear Bloqueo de Dominio
-        create_email_domain_block: Crear Bloqueo de Dominio de Correo Electrónico
+        create_email_domain_block: Crear bloqueo de dominio de correo electrónico
        create_ip_block: Crear regla IP
        create_unavailable_domain: Crear Dominio No Disponible
        create_user_role: Crear rol
        demote_user: Degradar Usuario
        destroy_announcement: Eliminar Anuncio
-        destroy_canonical_email_block: Eliminar Bloqueo de Correo Electrónico
+        destroy_canonical_email_block: Eliminar bloqueo de correo electrónico
        destroy_custom_emoji: Eliminar Emoji Personalizado
        destroy_domain_allow: Eliminar Permiso de Dominio
        destroy_domain_block: Eliminar Bloqueo de Dominio
-        destroy_email_domain_block: Eliminar Bloqueo de Dominio de Correo Electrónico
+        destroy_email_domain_block: Eliminar bloqueo de dominio de correo electrónico
        destroy_instance: Purgar dominio
        destroy_ip_block: Eliminar regla IP
        destroy_status: Eliminar Estado
@ -876,8 +876,8 @@ es-MX:
      sidekiq_process_check:
        message_html: No hay ningún proceso Sidekiq en ejecución para la(s) cola(s) %{value}. Por favor, revise su configuración de Sidekiq
      software_version_check:
-        action: Ver actualizaciones disponibles
-        message_html: Hay disponible una actualización de Mastodon.
+        action: Ver las actualizaciones disponibles
+        message_html: Ya está disponible una actualización de Mastodon.
      software_version_critical_check:
        action: Ver actualizaciones disponibles
        message_html: Una actualización crítica de Mastodon está disponible, por favor actualice lo antes posible.
@ -1453,8 +1453,8 @@ es-MX:
      emails:
        notification_emails:
          favourite: correos de notificación de favoritos
-          follow: correos de notificación de nuevos seguidores
-          follow_request: correos de notificación de solicitud de seguidor
+          follow: correos electrónicos de notificación de seguimiento
+          follow_request: correos electrónicos de solicitud de seguimiento
          mention: correos de notificación de menciones
          reblog: correos de notificación de impulsos
      resubscribe_html: Si te has dado de baja por error, puedes volver a darte de alta desde tus <a href="%{settings_path}">ajustes de notificaciones por correo</a>.
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@ -24,6 +24,8 @@ fy:
  admin:
    account_actions:
      action: Aksje útfiere
+      already_silenced: Dizze account is al beheind.
+      already_suspended: Dizze account is al opskort.
      title: Moderaasjemaatregelen tsjin %{acct} nimme
    account_moderation_notes:
      create: Lit in opmerking efter
@ -45,6 +47,7 @@ fy:
        title: E-mailadres foar %{username} wizigje
      change_role:
        changed_msg: Rol mei sukses wizige!
+        edit_roles: Brûkersrollen beheare
        label: Rol wizigje
        no_role: Gjin rol
        title: Rol fan %{username} wizigje
@ -601,6 +604,7 @@ fy:
        suspend_description_html: De account en alle ynhâld sil net tagonklik wêze en úteinlik fuortsmiten wurde, en ynteraksje hjirmei sil net mooglik wêze. Binnen 30 dagen werom te draaien. Dit slút alle rapportaazjes oer dizze account.
      actions_description_html: Beslis hokker maatregel nommen wurde moat om dizze rapportaazje op te lossen. Wannear’t jo in (straf)maatregel tsjin it rapportearre account nimme, kriget de account in e-mailmelding, behalve wannear’t de <strong>spam</strong>-kategory keazen is.
      actions_description_remote_html: Beslút hokker aksje nommen wurde moat om dizze rapportaazje ôf te hanneljen. Dit hat allinnich ynfloed op hoe’t <strong>jo</strong> server kommunisearret mei dizze eksterne account en omgiet mei de ynhâld.
+      actions_no_posts: Dit rapport hat gjin byhearrende berjochten om fuort te smiten
      add_to_report: Mear oan de rapportaazje tafoegje
      already_suspended_badges:
        local: Al opskoarte op dizze server
@ -871,6 +875,9 @@ fy:
        message_html: Jo hawwe foar dizze server gjin regels opsteld.
      sidekiq_process_check:
        message_html: Der draait gjin Sidekiq-proses foar de wachtrige(n) %{value}. Kontrolearje jo Sidekiq-konfiguraasje
+      software_version_check:
+        action: Beskikbere fernijingen besjen
+        message_html: Der is in Mastodon-fernijing beskikber.
      software_version_critical_check:
        action: Beskikbere fernijingen besjen
        message_html: Der is in kritike fernijing foar Mastodon beskikber. Wurkje sa gau as mooglik by.
@ -1156,6 +1163,12 @@ fy:
      view_strikes: Besjoch de earder troch moderatoaren fêststelde skeiningen dy’t jo makke hawwe
    too_fast: Formulier is te fluch yntsjinne. Probearje it nochris.
    use_security_key: Befeiligingskaai brûke
+  author_attribution:
+    example_title: Faorbyldtekst
+    hint_html: Bepaal hoe’t wy jo fermelde, wannear’t jo keppelingen op Mastodon dield wurde.
+    more_from_html: Mear fan %{name}
+    s_blog: Weblog fan %{name}
+    title: Auteur-attribúsje
  challenge:
    confirm: Trochgean
    hint_html: "<strong>Tip:</strong> Wy freegje jo it kommende oere net mear nei jo wachtwurd."
@ -1682,6 +1695,7 @@ fy:
    delete: Account fuortsmite
    development: Untwikkelers
    edit_profile: Profyl bewurkje
+    export: Eksportearje
    featured_tags: Utljochte hashtags
    import: Ymportearje
    import_and_export: Ymportearje en eksportearje
@ -1931,6 +1945,7 @@ fy:
    instructions_html: Kopiearje en plak de ûndersteande koade yn de HTML fan jo website. Foegje dernei it adres fan jo website ta oan ien fan de ekstra fjilden op jo profyl op it ljepblêd ‘Profyl bewurkje’ en bewarje de wizigingen.
    verification: Ferifikaasje
    verified_links: Jo ferifiearre keppelingen
+    website_verification: Website-ferifikaasje
  webauthn_credentials:
    add: Nije befeiligingskaai tafoegje
    create:
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@ -903,6 +903,9 @@ gd:
        message_html: Cha do mhìnich thu riaghailtean an fhrithealaiche fhathast.
      sidekiq_process_check:
        message_html: Chan eil pròiseas Sidekiq sam bith a ruith dhan chiutha/dha na ciuthan %{value}. Thoir sùil air an rèiteachadh Sidekiq agad
+      software_version_check:
+        action: Faic na h-ùrachaidhean a tha ri fhaighinn
+        message_html: Tha ùrachadh Mastodon ri fhaighinn.
      software_version_critical_check:
        action: Faic na h-ùrachaidhean a tha ri fhaighinn
        message_html: Tha ùrachadh èiginneach air Mastodon ri fhaighinn, ùraich cho luath ’s a ghabhas.
@ -1021,7 +1024,7 @@ gd:
      delete: Sguab às
      edit_preset: Deasaich rabhadh ro-shuidhichte
      empty: Cha do mhìnich thu ro-sheataichean rabhaidhean fhathast.
-      title: Ro-sheataichean rabhaidhean
+      title: Rabhaidhean ro-shocraichte
    webhooks:
      add_new: Cuir puing-dheiridh ris
      delete: Sguab às
@ -1744,6 +1747,7 @@ gd:
    delete: Sguabadh às cunntais
    development: Leasachadh
    edit_profile: Deasaich a’ phròifil
+    export: Às-phortadh
    featured_tags: Tagaichean hais brosnaichte
    import: Ion-phortadh
    import_and_export: Ion-phortadh ⁊ às-phortadh
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -903,6 +903,9 @@ he:
        message_html: לא הוגדרו שום כללי שרת.
      sidekiq_process_check:
        message_html: שום הליכי Sidekiq לא רצים עבור %{value} תור(ות). בחנו בבקשה את הגדרות Sidekiq
+      software_version_check:
+        action: ראו עדכונים זמינים
+        message_html: עדכון מסטודון זמין כעת.
      software_version_critical_check:
        action: ראו עדכונים זמינים
        message_html: יצא עדכון קריטי למסטודון, נא לעדכן את תוכנת מסטודון בהקדם האפשרי.
@ -1744,6 +1747,7 @@ he:
    delete: מחיקת חשבון
    development: פיתוח
    edit_profile: עריכת פרופיל
+    export: ייצוא
    featured_tags: תגיות נבחרות
    import: יבוא
    import_and_export: יבוא ויצוא
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@ -877,6 +877,9 @@ is:
        message_html: Þú hefur ekki skilgreint neinar reglur fyrir netþjón.
      sidekiq_process_check:
        message_html: Ekkert Sidekiq-ferli er í gangi fyrir %{value} biðröð/biðraðir. Endilega athugaðu Sidekiq-uppsetninguna þína
+      software_version_check:
+        action: Skoða tiltækar uppfærslur
+        message_html: Uppfærsla er tiltæk fyrir Mastodon.
      software_version_critical_check:
        action: Skoða tiltækar uppfærslur
        message_html: Áríðandi uppfærsla Mastodon er tiltæk, uppfærðu eins fljótt og auðið er.
@ -1696,6 +1699,7 @@ is:
    delete: Eyðing notandaaðgangs
    development: Þróun
    edit_profile: Breyta notandasniði
+    export: Flytja út
    featured_tags: Myllumerki með aukið vægi
    import: Flytja inn
    import_and_export: Inn- og útflutningur
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -1141,6 +1141,9 @@ ja:
      view_strikes: 過去のストライクを表示
    too_fast: フォームの送信が速すぎます。もう一度やり直してください。
    use_security_key: セキュリティキーを使用
+  author_attribution:
+    example_title: サンプルテキスト
+    s_blog: "%{name} のブログ"
  challenge:
    confirm: 続ける
    hint_html: 以後1時間はパスワードの再入力を求めません
@ -1659,6 +1662,7 @@ ja:
    delete: アカウントの削除
    development: 開発
    edit_profile: プロフィールを編集
+    export: エクスポート
    featured_tags: 注目のハッシュタグ
    import: データのインポート
    import_and_export: インポート・エクスポート
@ -1903,6 +1907,7 @@ ja:
    instructions_html: 以下のコードをコピーしてwebサイトのHTMLに貼り付けます。次に「プロフィールを編集」タブから、「プロフィール補足情報」のいずれかの欄にwebサイトのURLを記入し、「変更を保存」をクリックしてください。
    verification: 認証
    verified_links: 確認済みリンク
+    website_verification: ウェブサイトの認証
  webauthn_credentials:
    add: セキュリティキーを追加
    create:
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@ -264,6 +264,8 @@ kab:
      domain: Taɣult
      new:
        create: Rnu taɣult
+    export_domain_allows:
+      no_file: Ula d yiwen ufaylu ma yettwafran
    export_domain_blocks:
      no_file: Ulac afaylu yettwafernen
    follow_recommendations:
@ -529,6 +531,10 @@ kab:
      account_status: Addad n umiḍan
      functional: Amiḍan-inek·inem yetteddu s lekmal-is.
    use_security_key: Seqdec tasarut n teɣlist
+  author_attribution:
+    example_title: Amedya n weḍris
+    more_from_html: Ugar s ɣur %{name}
+    s_blog: Ablug n %{name}
  challenge:
    confirm: Kemmel
    invalid_password: Yir awal uffir
@ -685,6 +691,9 @@ kab:
      subject: Yuder-ik·ikem-id %{name}
    reblog:
      subject: "%{name} yesselha addad-ik·im"
+      title: Azuzer amaynut
+    status:
+      subject: "%{name} akken i d-y·t·essufeɣ"
  number:
    human:
      decimal_units:
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -34,6 +34,7 @@ lv:
      created_msg: Moderācijas piezīme ir veiksmīgi izveidota!
      destroyed_msg: Moderācijas piezīme ir veiksmīgi iznīcināta!
    accounts:
+      add_email_domain_block: Liegt e-pasta domēnu
      approve: Apstiprināt
      approved_msg: Veiksmīgi apstiprināts %{username} reģistrēšanās pieteikums
      are_you_sure: Vai esi pārliecināts?
@ -61,6 +62,7 @@ lv:
      demote: Pazemināt
      destroyed_msg: Lietotāja %{username} dati tagad ievietoti rindā, lai tos nekavējoties izdzēstu
      disable: Iesaldēt
+      disable_sign_in_token_auth: Atspējot autentificēšanos ar e-pasta pilnvaru
      disable_two_factor_authentication: Atspējot 2FA
      disabled: Iesaldēts
      display_name: Parādāmais vārds
@ -69,6 +71,7 @@ lv:
      email: E-pasts
      email_status: E-pasta statuss
      enable: Atsaldēt
+      enable_sign_in_token_auth: Iespējot autentificēšanos ar e-pasta pilnvaru
      enabled: Iespējots
      enabled_msg: Veiksmīgi atsaldēts %{username} konts
      followers: Sekotāji
@ -180,17 +183,21 @@ lv:
        confirm_user: Apstiprināt lietotāju
        create_account_warning: Izveidot Brīdinājumu
        create_announcement: Izveidot Paziņojumu
+        create_canonical_email_block: Izveidot e-pasta liegumu
        create_custom_emoji: Izveidot pielāgotu emocijzīmi
        create_domain_allow: Izveidot Domēna Atļauju
        create_domain_block: Izveidot Domēna Bloku
+        create_email_domain_block: Izveidot e-pasta domēna liegumu
        create_ip_block: Izveidot IP noteikumu
        create_unavailable_domain: Izveidot Nepieejamu Domēnu
        create_user_role: Izveidot lomu
        demote_user: Pazemināt Lietotāju
        destroy_announcement: Dzēst Paziņojumu
+        destroy_canonical_email_block: Izdzēst e-pasta liegumu
        destroy_custom_emoji: Dzēst pielāgoto emocijzīmi
        destroy_domain_allow: Dzēst Domēna Atļauju
        destroy_domain_block: Dzēst Domēna Bloku
+        destroy_email_domain_block: Izdzēst e-pasta domēna liegumu
        destroy_instance: Attīrīt domēnu
        destroy_ip_block: Dzēst IP noteikumu
        destroy_status: Izdzēst Rakstu
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -1526,8 +1526,8 @@ nl:
      title: Nieuw volgverzoek
    mention:
      action: Reageren
-      body: 'Jij bent door %{name} vermeld in:'
-      subject: Jij bent vermeld door %{name}
+      body: 'Je bent door %{name} vermeld in:'
+      subject: Je bent vermeld door %{name}
      title: Nieuwe vermelding
    poll:
      subject: Een peiling van %{name} is beëindigd
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@ -1,7 +1,7 @@
 ---
 nn:
  about:
-    about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig idéane dine med Mastodon!'
+    about_mastodon_html: 'Framtidas sosiale nettverk: Ingen annonsar, ingen verksemder som overvaker deg, etisk design og desentralisering! Eig dataene dine med Mastodon!'
    contact_missing: Ikkje sett
    contact_unavailable: I/T
    hosted_on: "%{domain} er vert for Mastodon"
@ -39,7 +39,7 @@ nn:
      avatar: Bilete
      by_domain: Domene
      change_email:
-        changed_msg: Konto-e-posten er endra!
+        changed_msg: E-post for konto er endra!
        current_email: Noverande e-post
        label: Byt e-post
        new_email: Ny e-post
@ -62,7 +62,7 @@ nn:
      disable: Slå av
      disable_sign_in_token_auth: Slå av e-post-token-autentisering
      disable_two_factor_authentication: Slå av 2FA
-      disabled: Slege av
+      disabled: Inaktiv
      display_name: Synleg namn
      domain: Domene
      edit: Rediger
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -1888,7 +1888,7 @@ pt-BR:
        none: Aviso
        sensitive: Conta marcada como sensível
        silence: Conta silenciada
-        suspend: Conta banida
+        suspend: Conta suspensa
    welcome:
      apps_android_action: Disponível no Google Play
      apps_ios_action: Disponível na App Store
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@ -30,17 +30,25 @@ sc:
      created_msg: As creadu una nota de moderatzione.
      destroyed_msg: As cantzelladu una nota de moderatzione.
    accounts:
+      add_email_domain_block: Bloca domìniu de posta eletrònica
      approve: Aprova
      approved_msg: Sa dimanda de registru de %{username} est istada aprovada
      are_you_sure: Seguru?
      avatar: Immàgine de profilu
      by_domain: Domìniu
      change_email:
+        changed_msg: Indiritzu eletrònicu de su contu modificadu!
        current_email: Indiritzu eletrònicu atuale
        label: Muda s'indiritzu eletrònicu
        new_email: Indiritzu eletrònicu nou
        submit: Muda s'indiritzu eletrònicu
        title: Muda s'indiritzu eletrònicu de %{username}
+      change_role:
+        changed_msg: Ruolu modificadu.
+        edit_roles: Gesti is ruolos de utente
+        label: Modifica su ruolu
+        no_role: Nissunu ruolu
+        title: Modifica su ruolu de %{username}
      confirm: Cunfirma
      confirmed: Cunfirmadu
      confirming: Cunfirmende
@ -91,6 +99,7 @@ sc:
      most_recent_ip: IP prus reghente
      no_account_selected: Perunu contu est istadu mudadu, dae chi non nd'as seletzionadu
      no_limits_imposed: Sena lìmites
+      no_role_assigned: Nissunu ruolu assignadu
      not_subscribed: Sena sutiscritzione
      pending: De revisionare
      perform_full_suspension: Suspèndidu
@ -108,12 +117,19 @@ sc:
      removed_header_msg: S'immàgine de intestatzione de %{username} est istada bogada
      resend_confirmation:
        already_confirmed: Custa persone est giai cunfirmada
+        send: Torra a imbiare su ligòngiu de cunfirmatzione
+        success: Ligòngiu de cunfirmatzione imbiadu.
      reset: Reseta
      reset_password: Reseta sa crae
      resubscribe: Torra a sutascrìere
+      role: Ruolu
      search: Chirca
+      search_same_email_domain: Àteras persones cun su pròpiu domìniu de posta
      search_same_ip: Àteras persones cun sa pròpiu IP
      security: Seguresa
+      security_measures:
+        only_password: Crae isceti
+        password_and_2fa: Crae e 2FA
      sensitive: Sensìbile
      sensitized: Marcadu comente sensìbile
      shared_inbox_url: URL de intrada cumpartzida
@ -129,6 +145,8 @@ sc:
      suspension_irreversible: Is datos de custu contu sunt istados cantzellados in manera irreversìbile. Podes bogare sa suspensione a su contu pro chi si potzat impreare, ma no at a recuperare datu perunu de is chi teniat in antis.
      suspension_reversible_hint_html: Su contu est istadu suspèndidu, e is datos ant a èssere cantzelladu de su totu su %{date}. Finas a tando, su contu si podet ripristinare sena efetu malu perunu. Si boles cantzellare totu is datos de su contu immediatamente ddu podes fàghere inoghe in bassu.
      title: Contos
+      unblock_email: Isbloca s'indiritzu de posta eletrònica
+      unblocked_email_msg: Posta eletrònica de %{username} isblocada
      unconfirmed_email: Posta eletrònica sena cunfirmare
      undo_sensitized: Boga sa marcadura comente sensìbile
      undo_silenced: Non pòngias a sa muda
@ -143,21 +161,31 @@ sc:
      whitelisted: Federatzione permìtida
    action_logs:
      action_types:
+        approve_user: Aprova s'utente
        assigned_to_self_report: Assigna s'informe
+        change_email_user: Muda s'indiritzu eletrònicu pro s'utente
+        change_role_user: Muda su ruolu de s'utente
        confirm_user: Cunfirma s'utente
        create_account_warning: Crea un'avisu
        create_announcement: Crea un'annùntziu
+        create_canonical_email_block: Crea unu blocu de posta eletrònica
        create_custom_emoji: Crea un'emoji personalizadu
        create_domain_allow: Crea unu domìniu permìtidu
        create_domain_block: Crea unu blocu de domìniu
+        create_email_domain_block: Crea unu blocu de domìniu de posta eletrònica
        create_ip_block: Crea una règula IP
+        create_unavailable_domain: Crea unu domìniu no a disponimentu
+        create_user_role: Crea unu ruolu
        demote_user: Degrada s'utente
        destroy_announcement: Cantzella s'annùntziu
+        destroy_canonical_email_block: Cantzella su blocu de posta eletrònica
        destroy_custom_emoji: Cantzella s'emoji personalizadu
        destroy_domain_allow: Cantzella su domìniu permìtidu
        destroy_domain_block: Cantzella su blocu de domìniu
+        destroy_email_domain_block: Cantzella su blocu de domìniu de posta eletrònica
        destroy_ip_block: Cantzella sa règula IP
        destroy_status: Cantzella s'istadu
+        destroy_unavailable_domain: Cantzella su domìniu no a disponimentu
        disable_2fa_user: Disativa 2FA
        disable_custom_emoji: Disativa s'emoji personalizadu
        disable_user: Disativa utente
@ -165,23 +193,33 @@ sc:
        enable_user: Ativa utente
        memorialize_account: Torra in unu contu de regordu
        promote_user: Promove utente
+        reject_user: Refuda s'utente
        remove_avatar_user: Cantzella immàgine de profilu
        reopen_report: Torra a abèrrere s'informe
+        resend_user: Torra a imbiare messàgiu eletrònicu de cunfirmatzione
        reset_password_user: Reseta sa crae
        resolve_report: Isorve s'informe
        sensitive_account: Marca is cuntenutos multimediales in su contu tuo comente sensìbiles
        silence_account: Pone custu contu a sa muda
        suspend_account: Suspende custu contu
        unassigned_report: Boga s'assignatzione de custu informe
+        unblock_email_account: Isbloca s'indiritzu de posta eletrònica
        unsensitive_account: Boga sa marcadura "sensìbiles" a is elementos multimediales in su contu tuo
        unsilence_account: Boga custu contu de is contos a sa muda
        unsuspend_account: Boga custu contu de is contos suspèndidos
        update_announcement: Atualiza s'annùntziu
        update_custom_emoji: Atualiza s'emoji personalizadu
        update_domain_block: Atualiza blocu de domìniu
+        update_ip_block: Atualiza sa règula IP
+        update_report: Atualiza s'informe
        update_status: Atualiza s'istadu
+        update_user_role: Atualiza su ruolu
      actions:
+        approve_user_html: "%{name} at aprovadu su registru de %{target}"
        assigned_to_self_report_html: "%{name} s'est auto-assignadu s'informe %{target}"
+        change_email_user_html: "%{name} at mudadu s'indiritzu de posta eletrònica de s'utente %{target}"
+        change_role_user_html: "%{name} at mudadu su ruolu de %{target}"
+        confirm_user_html: "%{name} at cunfirmadu s'indiritzu de posta eletrònica de s'utente %{target}"
        create_account_warning_html: "%{name} at imbiadu un'avisu a %{target}"
        create_announcement_html: "%{name} at creadu un'annùntziu nou %{target}"
        create_custom_emoji_html: "%{name} at carrigadu un'emoji nou %{target}"
@ -291,6 +329,8 @@ sc:
      confirm_suspension:
        cancel: Annulla
        confirm: Suspende
+        remove_all_data: Custu at a cantzellare totu su cuntenutu, elementos multimediales e datos de profilu pro is contos de custu domìniu dae su serbidore tuo.
+        stop_communication: Su serbidore tuo at a tzessare sa comunicatzione cun custos serbidores.
        title: Cunfirma su blocu de domìniu de %{domain}
      created_msg: Protzessende su blocu de domìniu
      destroyed_msg: Su blocu de domìniu est istadu iscontzadu
@ -361,9 +401,12 @@ sc:
      dashboard:
        instance_accounts_dimension: Contos prus sighidos
        instance_accounts_measure: contos sarvados
+        instance_languages_dimension: Limbas printzipales
        instance_reports_measure: informes a subra de àtere
+        instance_statuses_measure: publicatziones sarvadas
      delivery:
        all: Totus
+        unavailable: No a disponimentu
      delivery_available: Sa cunsigna est a disponimentu
      empty: Perunu domìniu agatadu.
      known_accounts:
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@ -3,6 +3,7 @@ fy:
  simple_form:
    hints:
      account:
+        attribution_domains_as_text: Beskermet tsjin net korrekte attribúsjes.
        discoverable: Jo iepenbiere berjochten kinne útljochte wurde op ferskate plakken binnen Mastodon en jo account kin oanrekommandearre wurde oan oare brûkers.
        display_name: Jo folsleine namme of in aardige bynamme.
        fields: Jo website, persoanlike foarnammewurden, leeftiid, alles wat jo mar kwyt wolle.
@ -130,6 +131,7 @@ fy:
        name: Jo kinne elk wurd mei in haadletter begjinne, om sa bygelyks de tekst mear lêsber te meitsjen
      user:
        chosen_languages: Allinnich berjochten yn de selektearre talen wurde op de iepenbiere tiidline toand
+        role: De rol bepaalt hokker rjochten in brûker hat.
      user_role:
        color: Kleur dy’t brûkt wurdt foar de rol yn de UI, as RGB yn heksadesimaal formaat
        highlighted: Dit makket de rol iepenbier sichtber
@ -142,6 +144,7 @@ fy:
        url: Wêr’t eveneminten nei ta stjoerd wurde
    labels:
      account:
+        attribution_domains_as_text: Allinnich bepaalde websites tastean
        discoverable: Profyl en bydragen yn sykalgoritmen opnimme litte
        fields:
          name: Label
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@ -86,6 +86,7 @@ lv:
        custom_css: Vari lietot pielāgotus stilus Mastodon tīmekļa versijā.
        favicon: WEBP, PNG, GIF vai JPG. Aizstāj noklusējuma Mastodon favikonu ar pielāgotu.
        mascot: Ignorē ilustrāciju uzlabotajā tīmekļa saskarnē.
+        media_cache_retention_period: Informācijas nesēju datnes no ierakstiem, kurus ir veikuši attālie lietotāji, tiek kešoti šajā serverī. Kad ir iestatīta apstiprinoša vērtība, informācijas nesēji tiks izdzēsti pēc norādītā dienu skaita. Ja informācijas nesēju dati tiks pieprasīti pēc tam, kad tie tika izdzēsti, tie tiks atkārtoti lejupielādēti, ja avota saturs joprojām būs pieejams. Saišu priekšskatījuma karšu vaicājumu biežuma ierobežojumu dēļ ir ieteicams iestatīt šo vērtību vismaz 14 dienas vai saišu priekšskatījuma kartes netiks atjauninātas pēc pieprasījuma pirms tā laika.
        peers_api_enabled: Domēna vārdu saraksts, ar kuriem šis serveris ir saskāries fediversā. Šeit nav iekļauti dati par to, vai tu veic federāciju ar noteiktu serveri, tikai tavs serveris par to zina. To izmanto dienesti, kas apkopo statistiku par federāciju vispārīgā nozīmē.
        profile_directory: Profilu direktorijā ir uzskaitīti visi lietotāji, kuri ir izvēlējušies būt atklājami.
        require_invite_text: 'Ja pierakstīšanai nepieciešama manuāla apstiprināšana, izdari tā, lai teksta: “Kāpēc vēlaties pievienoties?” ievade ir obligāta, nevis opcionāla'
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@ -295,7 +295,7 @@ nl:
        favourite: Wanneer iemand jouw bericht als favoriet markeert
        follow: Wanneer iemand jou is gaan volgen
        follow_request: Wanneer iemand jou wil volgen
-        mention: Wanneer iemand jou heeft vermeld
+        mention: Je bent door iemand vermeld
        pending_account: Wanneer een nieuw account moet worden beoordeeld
        reblog: Wanneer iemand jouw bericht heeft geboost
        report: Nieuwe rapportage is ingediend
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -8,10 +8,10 @@ sk:
    title: Ohľadom
  accounts:
    followers:
-      few: Sledovateľov
+      few: Sledujúcich
      many: Sledovateľov
      one: Sledujúci
-      other: Sledovatelia
+      other: Sledujúci
    following: Nasledujem
    instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
    last_active: naposledy aktívny
@ -1167,7 +1167,7 @@ sk:
    dormant: Spiace
    follow_failure: Nemožno nasledovať niektoré z vybraných účtov.
    follow_selected_followers: Následuj označených sledovatelov
-    followers: Následovatelia
+    followers: Sledovatelia
    following: Nasledovaní
    invited: Pozvaný/á
    last_active: Naposledy aktívny
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -1,7 +1,7 @@
 ---
 tr:
  about:
-    about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezileştirilmemiş</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir.
+    about_mastodon_html: Mastodon <em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezi olmayan</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Mastodon sunucusunu kurabilir ve sorunsuz bir şekilde Mastodon <em>sosyal ağına</em> dahil edebilir!
    contact_missing: Ayarlanmadı
    contact_unavailable: Bulunamadı
    hosted_on: Mastodon %{domain} üzerinde barındırılıyor
--- a/db/migrate/20241007071624_fix_notification_permission_foreign_keys.rb
+++ b/db/migrate/20241007071624_fix_notification_permission_foreign_keys.rb
@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+class FixNotificationPermissionForeignKeys < ActiveRecord::Migration[7.1]
+  def up
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_permissions
+          DROP CONSTRAINT fk_rails_7c0bed08df,
+          ADD CONSTRAINT fk_rails_7c0bed08df
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE,
+
+          DROP CONSTRAINT fk_rails_e3e0aaad70,
+          ADD CONSTRAINT fk_rails_e3e0aaad70
+            FOREIGN KEY (from_account_id)
+            REFERENCES accounts(id)
+            ON DELETE CASCADE
+      SQL
+    end
+  end
+
+  def down
+    safety_assured do
+      execute <<~SQL.squish
+        ALTER TABLE notification_permissions
+          DROP CONSTRAINT fk_rails_7c0bed08df,
+          ADD CONSTRAINT fk_rails_7c0bed08df
+            FOREIGN KEY (account_id)
+            REFERENCES accounts(id),
+
+          DROP CONSTRAINT fk_rails_e3e0aaad70,
+          ADD CONSTRAINT fk_rails_e3e0aaad70
+            FOREIGN KEY (from_account_id)
+            REFERENCES accounts(id)
+      SQL
+    end
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.

-ActiveRecord::Schema[7.1].define(version: 2024_09_16_190140) do
+ActiveRecord::Schema[7.1].define(version: 2024_10_07_071624) do
  # These are extensions that must be enabled in order to support this database
  enable_extension "plpgsql"

@ -1294,8 +1294,8 @@ ActiveRecord::Schema[7.1].define(version: 2024_09_16_190140) do
  add_foreign_key "mentions", "statuses", on_delete: :cascade
  add_foreign_key "mutes", "accounts", column: "target_account_id", name: "fk_eecff219ea", on_delete: :cascade
  add_foreign_key "mutes", "accounts", name: "fk_b8d8daf315", on_delete: :cascade
-  add_foreign_key "notification_permissions", "accounts"
-  add_foreign_key "notification_permissions", "accounts", column: "from_account_id"
+  add_foreign_key "notification_permissions", "accounts", column: "from_account_id", on_delete: :cascade
+  add_foreign_key "notification_permissions", "accounts", on_delete: :cascade
  add_foreign_key "notification_policies", "accounts", on_delete: :cascade
  add_foreign_key "notification_requests", "accounts", column: "from_account_id", on_delete: :cascade
  add_foreign_key "notification_requests", "accounts", on_delete: :cascade
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -59,7 +59,7 @@ services:
  web:
    # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
    # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.0-rc.1
+    image: ghcr.io/mastodon/mastodon:v4.3.0
    restart: always
    env_file: .env.production
    command: bundle exec puma -C config/puma.rb
@ -83,7 +83,7 @@ services:
    # build:
    #   dockerfile: ./streaming/Dockerfile
    #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-rc.1
+    image: ghcr.io/mastodon/mastodon-streaming:v4.3.0
    restart: always
    env_file: .env.production
    command: node ./streaming/index.js
@ -101,7 +101,7 @@ services:

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

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

    def prerelease
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@ -14,6 +14,17 @@ RSpec.describe NotificationMailer do
    end
  end

+  shared_examples 'delivery without status' do
+    context 'when notification target_status is missing' do
+      before { allow(notification).to receive(:target_status).and_return(nil) }
+
+      it 'does not deliver mail' do
+        emails = capture_emails { mail.deliver_now }
+        expect(emails).to be_empty
+      end
+    end
+  end
+
  let(:receiver)       { Fabricate(:user, account_attributes: { username: 'alice' }) }
  let(:sender)         { Fabricate(:account, username: 'bob') }
  let(:foreign_status) { Fabricate(:status, account: sender, text: 'The body of the foreign status') }
@ -37,6 +48,7 @@ RSpec.describe NotificationMailer do
    end

    include_examples 'delivery to non functional user'
+    include_examples 'delivery without status'
  end

  describe 'follow' do
@ -75,6 +87,7 @@ RSpec.describe NotificationMailer do
    end

    include_examples 'delivery to non functional user'
+    include_examples 'delivery without status'
  end

  describe 'reblog' do
@ -95,6 +108,7 @@ RSpec.describe NotificationMailer do
    end

    include_examples 'delivery to non functional user'
+    include_examples 'delivery without status'
  end

  describe 'follow_request' do